Merge pull request #8 from danielrichman/master

Miscellaneous deployment tweaks