Merge current experimental branch with master

For when I want to Gource it up in here