confict resolutions left over from the odyssey migration
Added some gfortran specific fixes for BRAMS compile
Merge pull request #2 from rgknox/master

Fixes from Odyssey transition