history update in preparation for release
Merge pull request #1295 from drewfish/history

history update in preparation for release