More specific include and class chaining.

[systemsathomesdotcom]

This will help fight confusion with top-level classes, such as:
Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Evaluation Error: Error while evaluating a Function Call, Could not find class ::preinstall for ...

[systemsathomesdotcom]

Hopefully Travis agrees, but build passes on Vagrant.

vagrant@generic:~/puppet-redis$ bundle exec rake spec
Cloning into 'spec/fixtures/modules/stdlib'...
remote: Counting objects: 6224, done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 6224 (delta 4), reused 4 (delta 0)
Receiving objects: 100% (6224/6224), 1.25 MiB, done.
Resolving deltas: 100% (2657/2657), done.
Cloning into 'spec/fixtures/modules/apt'...
remote: Counting objects: 3184, done.
remote: Compressing objects: 100% (1426/1426), done.
remote: Total 3184 (delta 1721), reused 3121 (delta 1683)
Receiving objects: 100% (3184/3184), 675.00 KiB, done.
Resolving deltas: 100% (1721/1721), done.
/usr/bin/ruby1.8 -S rspec spec/classes/redis_sentinel_spec.rb spec/classes/redis_spec.rb --color
ldapname is deprecated and will be removed in a future version
..........................................................................

Finished in 14.14 seconds
74 examples, 0 failures