Merge branch 'master' into tool-for-adding-a-track
rm comment
id -> _id (per de facto standards)
Merge pull request #58 from Trott/tool-for-adding-a-track

Tool for adding a track