updated amalgamation
Merge branch 'source' of github.com:cyclus/cyclus.github.com into source