Rewriting things in python
Merge remote-tracking branch 'jake/master'