Synchronize the master branch with updated build process.
Sync master branch with source branch build process.
Merge pull request #33 from cyclus/sync_final_build_changes

Sync final build changes