Merge pull request #55 from hybris/a6aeb58172be2575ca58c88720a7d8a98fb1a129

see #52
fixed syntax-error introduced with #52
Merge pull request #57 from k9ert/master

fixed syntax-error introduced with #52
Expanded by custom hash lookup
Automatic README conversion from rdoc to md
Automatic README conversion from rdoc to md
Fixed test
Enabling Travis integration
Disabling puppet lint checks on Travis
Added test on Puppet 2.6
Fixing arrays in templates for ruby 1.9.3 compatibility
Tuning Travis matrix
Tuning Travis matrix 2
Tuning Travis matrix 3
Merge pull request #58 from mikenowak/master

options_lookup() extended by custom hash name
Release updated and published to the Forge
Removed puppet-blacksmith from default rakefile for compatibility issues
Fix
adding parametrized timeout to puppi run
Merge pull request #61 from MalteJ/master

adding a parametrized timeout to puppi runs