adjusted
Merge branch 'master' of https://github.com/Kikobeats/generator-git

* 'master' of https://github.com/Kikobeats/generator-git:
  updated
  fixed bash functions and updated travis settings
new build