tags working - needs a little work
Merge pull request #46 from mejackreed/master

tags working - needs a little work
cleaning up codebase
Merge pull request #47 from mejackreed/master

cleaning up codebase
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app

Conflicts:
	api/serializers.py
	frontend/static/js/map.js