Merge remote-tracking branch 'parent/master' into features/31_extend_CHEF

Conflicts:
	.chef/knife.rb
	.gitignore
	.travis.yml
	LICENSE
	Rakefile
	Vagrantfile