cleaned up directives
Merge branch 'master' of https://github.com/StrategicDevelopment/FoodCoop

Conflicts:
	app/js/directives.js