Merge london_hackathon branch into master branch

Looks to me like these changes can be merged into the master branch. Yes?