enable better configuration and multiple ini paths for fpm
Merge branch 'hotfix/0.3.0'
fix forgotten package_name
Update gem and berks deps and fix indent
Merge branch 'jakubriedl-master'

* jakubriedl-master:
  Update gem and berks deps and fix indent
  fix forgotten package_name
  enable better configuration and multiple ini paths for fpm

Conflicts:
	Gemfile.lock