Merge work into master for now

I am going to be directly merging into develop then to master until we have a sandbox setup to point to develop. Until then, developers have to use local instances of the services so I am just going to put everything into master