Cleaned the makefile a trifle.
Merge branch 'master' of github.com:SoftlySplinter/sherlock