wip
Merge branch 'jon' of github.com:Erotemic/hotspotter into jon