Support more flexible deployment configuration
Merge pull request #403 from projecttacoma/deployment

Support more flexible deployment configuration