Configured for Heroku
Changed servlet location
Merge branch 'develop'
Rolling update
Pulled out the process of downloading
Temp changes
Fixed the config process
Fixed pom for release stuff
Fixed merge
Temp master commit
Merge branch 'master' into develop
Tidied up after commit
Think this fixes the foursquare stuff
Working on making the system a little more robust
Fixed the web problems
Merge branch 'develop'
[maven-release-plugin] prepare release untappdpicker-0.1
[maven-release-plugin] prepare for next development iteration
Bumped the DB version
Merge branch 'master' into develop