Updated license
Merge branch 'jon' of https://github.com/Erotemic/hotspotter into jon