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
Merge pull request #90 from kmeurer/proximityapi

Update dbSchema to use underscored variable names.
Attempts new travis approach
Attempts to fix travis
Small edit to index.html to test travis
Merge pull request #77 from jamesongamble/master

Attempts new travis approach
Tweaks last travis approach
Add grunt tasks to manage database
Merge pull request #91 from jamesongamble/master

Tweaks last travis approach
Edits index.html again
Merge pull request #93 from jamesongamble/master

Changes index.html to test CI with new travis
Sets travis to automatically email all members after successful/failure deployment
Merge pull request #95 from jamesongamble/master

Sets travis to automatically email all members after successful/failure ...
Merge pull request #92 from ryojiosawa/grunt

Add Grunt tasks to set up database
Complete setup of proximity routes.
Complete update function. Add spec file.
Remove bookshelf and knex from package.json.