fixed test setup
added travis config
some fixups in code, added license header
merge branches
Merge branch 'master' of github.com:computerlyrik/chef-zarafa

Conflicts:
	.kitchen.yml
	recipes/default.rb
Merge branch 'master' of github.com:computerlyrik/chef-zarafa