Updated makefile
Merge branch 'master' of github.com:makilian/Mist
More makefile adjustments