Merge pull request #37 from mejackreed/master

oops fixed something in api.model
cleanup merging thurs pm
fixed serializers merge
Merge pull request #38 from mejackreed/master

homepage stuff
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app into tagging
Merge pull request #40 from mejackreed/master

add unicode for source
Merge pull request #41 from sasali/master

Change From Class
updated
cleaned up maps
Half of the front page

will continue work Wed.