fixed up makefiles
Merge branch 'master' of github.com:lukesalisbury/meg