Merge branch 'release/0.2.0'
Merge branch 'development'
Merge branch 'release/0.3.0'
Merge branch 'release/0.3.1'
Merge branch 'release/0.4.0'
Merge branch 'master' of github.com:maxmeyer/puppet_generator
version bump to 0.5.0
Merge branch 'release/0.5.0'
Merge remote-tracking branch 'origin/master' into merger