Merge branch 'release/0.6.0' into develop
Add ripienaar/concat to fix postgresql rspec error.
Add rspec require to Exec['scm_prepare_database'].

The if/else statements defining the require parameter were ordered
incorrectly.  Now we require the database service when talking to a
database on the local machine.
Drop Travis support for testing old releases.

There are errors in the mysql modules on PUppet 2.6 versions and it is
quicker to drop testing in Travis-CI that to figure out what needs to be
fixed.
Remove Note in README that was fixed in 0.6.0.
Update versions for 0.6.1 release.
Merge branch 'release/0.6.1'