More deploy updates
Merge pull request #8 from bbeck/master

More deploy updates