Got deploy to work
Merge pull request #169 from nwinklareth/v2.0-dev

Got deploy to work