updated amalgamate for new src dir

For cyclus so should probably be reviewed by @katyhuff or @gidden.

**Bounty** - 1