makefile tweaks
Merge branch 'master' of github.com:klkuhlm/ltaem
Merge branch 'master' of github.com:klkuhlm/ltaem

Conflicts:
	fortran/Makefile