Small changes to makefiles
Merge branch 'devel' into coulomb