Sherlock stuff
Merge branch 'master' of github.com:leeping/etc
Merge branch 'master' of github.com:leeping/etc