Fixed formatting and makefiles
Merge branch 'master' of github.com:noccylabs/immp-spec