Merge in server changes needed to run a development server on Heroku
jshintrc modifications