Add locaiton.spec file
Rename middleware to serverConfig and clean up some code
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	server/server.js
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Add grunt tasks to manage database
Update before_step to create a database to run mocha tests
Merge pull request #92 from ryojiosawa/grunt

Add Grunt tasks to set up database
Merge pull request #97 from ryojiosawa/travis

Update before_step to create a database to run mocha tests
Should send emails to all members on each continuous deployment/build
Deletes unnecessary comments from travis
Fixes accidentally deleted notifications and email commands
Remove "grunt test" task from .travis.yml
Merge pull request #98 from jamesongamble/master

Should send emails to all members on each continuous deployment/build
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into travis

Conflicts:
	.travis.yml
Merge pull request #99 from ryojiosawa/travis

Remove "grunt test" task from .travis.yml
merge into travis
merge upstream
create insertion tests and ignore angular in jshintrc
fix tests to accomodate underscore
add test to check existence of location rest api