heroku config
Merge branch 'master' of github.com:KyperTech/maritime

Conflicts:
	views/cleanHome.jade.orig
Added reference to heroku addon mongodb into or statement with test db.