Open .coffee.erb files in coffee-mode
Diminish Redshank completely, not just the confusing "R"
Add github-browse-file
Merge branch 'master' of https://github.com/purcell/emacs.d

Conflicts:
	init-javascript.el
Small type for coffee mode in .coffee.erb files and mmm-mode