Merge pull request #6 from cdepman/master

merge conflict resolved
Adds Procfile for heroku deployment
Fixes library variable names
Merge pull request #7 from trizko/master

Adds Procfile for heroku deployment
Cleans up server files
Merge pull request #8 from trizko/master

Cleans up server files
adds googlePlaces API