Working on stuff for testing
Updated travis-ci testing
Updated travis config to exclude some puppet versions; fixed syntax in gemfile
Update Puppet version
Updated spec test language
Remove trailing comma from rspec test to appease 1.8.7
Travis testing for master
Fix travis testing for 1.8.7
Merge branch 'travis_testing'
Add fixtures