prep for release
Merge pull request #1177 from drewfish/prep-release

prep for release