Updates across the board

Managing ~/.emacs.d now
Re-arranging things
Adding Minecraft and Prosody to Bistromath
Bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	site.pp