cleanup merging thurs pm
fixed serializers merge
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app into tagging
updated
cleaned up maps
Merge pull request #43 from mejackreed/master

cleaned up maps
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app
refined AddMap interface, problems with AddSource because of tags field