Battenberg

- Cleans up error message when merging results in conflicts. (See [13](https://github.com/zillow/battenberg/pull/13))

- Adds in remote fetching of `origin/template` branch during upgrades. (See [12](https://github.com/zillow/battenberg/pull/12))

- Revert back to relying on mainline `cookiecutter` instead of Zillow fork. (See [9](https://github.com/zillow/battenberg/pull/9))

- Add in support for reading template context from `.cookiecutter.json`. (See [2](https://github.com/zillow/battenberg/pull/2))
- Add in `--merge-target` CLI option. (See [4](https://github.com/zillow/battenberg/pull/4))
- Expanded test coverage, added in CI/CD via Travis CI. (See [8](https://github.com/zillow/battenberg/pull/8))

Prior to v0.1.0 `battenberg` was developed under the [`milhoja`](https://github.com/rmedaer/milhoja) project.