fix template variable for analytics
protect addToMap function from not having a record get created
Merge branch 'master' into integration
Merge branch 'master' of github.com:MapStory/mapstory
a number of gitignores
extract analytics to tag, add to map view page
Merge branch 'master' into integration

Conflicts:
	.gitignore