Updating master with latest from development

Now that we have rolled out the initial version of the site, let's update the master branch with what we currently have out there live and in the develop branch