Remove puppet 3.2, 3.3 from travis (Bug 22729)
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
version bump: 1.1.0
Merge pull request #23 from jlambert121/master

Version bump: 1.1.0