fix makefile; if something is wrong, there should be a better way to fix it
Merge branch 'master' of github.com:jeffhammond/oshmpi