Cleaned up makefiles
Merge branch 'master' of github.com:landreman/perfect