Merge this one

I think I managed to create a new branch, cherry-pick the commit post-deletion of the unnecessary binary files and then merge this back in, but there is still a crazy amount of crap in that Prezi folder so its making my browser not handle this page well.

Git is really confusing sometimes.