Turns out you cant take C-j for granted.
Merge branch 'master' of github.com:fakedrake/dotemacs

Conflicts:
	fd-misc-programming.el