Merge tag 'v1.1.0'

1.1.0
gitignore: ignore common stuff
phase-list: expose zipMerge via public API
Merge pull request #8 from strongloop/feature/extract-zipmerge

phase-list: expose zipmerge via a public API
v1.2.0
Merge branch 'release/1.2.0' into production