Merge pull request #40 from SalesforceFoundation/feature/13-codeship-integration

Feature/13 codeship integration
Provide default values for missing cumulusci.properties for which a
default can be determined
Merge pull request #41 from SalesforceFoundation/feature/13-codeship-integration

Added in master deploy running in parallel with packaging org deploy
Merge pull request #42 from SalesforceFoundation/feature/38-property-defaults

Provide default values for missing cumulusci.properties
Merge branch 'master' into feature/13-codeship-integration