30 July 2013

Merging back into master. This is the final commit, as I am removing
this from github.