begin server refactor, import routes into app.js
middleware is now modular
merge master from 11/16 pm, db refactor
pulls more config code out of app.js
merge in deleteserver, replace routes
Merge branch 'master' of https://github.com/kinetech/Performance

Conflicts:
	app.js
merge deleteserver into app.js refactor

Merge branch 'master' into serverRefactor

Conflicts:
	app.js
Merge pull request #55 from kinetech/serverRefactor

Server refactor