Merge pull request #42 from albertsun/master

Was getting a 500 on user location agent
work in progress
bug fixes
Merge pull request #43 from cantino/foreman_deployment

Foreman deployment