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.