Had to black out the ido-ubiquitous el-get recipe stuff for some reason - emacs/el-get doesnt seem to know about it at startup
Merge remote-tracking branch 'refs/remotes/origin/new-master' into jn-big
Merge remote branch 'refs/remotes/origin/jn-big' into jn-little