small changes to makefiles to select f95 compiler when needed. This needs to be fixed for automated detection