Makefile Changes. Reordered and cleaned.
Merge branch 'master' of github.com:Necrolgan/NEctroverse