added location
Merge branch 'master' of github.com:marasm/GeekyTime
merge and location tweaking