Adds custom URLs via FriendlyID
Merge branch 'master' into friendly_ids

Conflicts:
	db/schema.rb
oops
Edits migration to automatically resave courses
Merge pull request #57 from grahamcracker/friendly_ids

Adds custom URLs via FriendlyID