s/jfdi/Coursemology
Merge branch 'jsyeo-rename' of github.com:jsyeo/coursemology.org into dev/raymoond_dev

Conflicts:
	app/helpers/application_helper.rb