tweaks for git
Normalize all the line endings
more tweaks to git files
removed backup files
add .nfs so no stale nfs handles can be pushed anymore
Merge pull request #1 from EDmodel/small-git-tweaks

Small git tweaks
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
Defined 5 new PFTs for PNW; Western Hardwoods, Western Pines, Firs, and Dryland C4 and C3 grass. All the variables and parameters are based on files from Ke at Harvard. Model compiles and runs. Submitted the first run. Needs sanity check on the results.