squashing bug of location not being saved
Merge branch 'master' of github.com:willh/hackday2013