Merge updates from previous pull request branch

- Merge branch 'pull_request_03_12_2013_a'
  into pull_request_03_25_2013_a.
Merge updates from previous pull request branch

- Merge branch 'pull_request_03_12_2013_a'
  into pull_request_03_25_2013_a.
Add password_for_default_users setup to setup.rb

- Generate password_for_default_users if not existing
  in the settings.yml file in subsequent updates.
Merge updates from pull request branch

- Merge remote-tracking branch 'pull_request_03_25_2013_a'
  into test_cleanup_03_20_2013_a.