Merge branch 'master' of https://github.com/dcmonger/twitnode
location tracking for map