Goddard 6.4.0 Update 2014-10-07

Changes to some Makefiles in the build tree.
Version number not changed.
Merge '6.4.0' update into development