Revert "bugfix for error message"

This reverts commit 21f005936efc75cf8c5fed08e315f297b7febf0c.
Merge branch 'master' of git://github.com/rightscale/virtualmonkey
Squashed commit of the following:

commit 8d698869c7170670e1e8cdb94e8d98a2bb3e4274
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 14 22:06:41 2012 +0000

    New DNS name/choice override (via .config.yaml file) feature.

commit 095934faf5ba0421f6007db630ff86d2adb2afc3
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Thu Mar 8 22:56:50 2012 +0000

    Added additional timeouts logic and more timeout values based on complete collateral testing.

commit cff296f3bd618ab62367c34cab763f2c7b1dece6
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Thu Mar 8 22:08:23 2012 +0000

    Added additional timeouts logic and more timeout values based on complete collateral testing.

commit 2b2e650b9de32729a30c34e392cc932dfc9a5f53
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 7 20:57:48 2012 +0000

    Updated copyright notice.

commit 554708fc52aac30c72f2b2793581d0d24a966aaa
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 7 20:51:38 2012 +0000

    Updated licence agreement.

commit cc97b498e347390946a0e039dce13d5ef0bddb19
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 7 19:29:59 2012 +0000

    Monkey now prints out copyright notice, version number and branch on startup.

commit 911ae008d94ec180f699e952c7292e5e2fddbd60
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 7 02:43:37 2012 +0000

    Added more timeout fixes driven by further testing with the new collateral.

commit 476b00b20d65507741d869627afdfd4004cc78fb
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Mar 7 00:30:08 2012 +0000

    run_script_on_set timeout changes.

commit 19737c9fbe74b3256df4d2364c5336e9dea35b7e
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Tue Mar 6 00:47:22 2012 +0000

    Command-line timeout override logic.

commit b592431e9af6b1038ef14d2555a5baaf3edd38aa
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Thu Mar 1 01:08:39 2012 +0000

    Changed puts to a warn for unkown state.

commit 2a2429450f0f54e075f0fc4925eabde23faab7a7
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Thu Mar 1 00:12:22 2012 +0000

    All virtual monkey config.yaml files must now be prefixed with a '.'

commit 64d5eaa0e8f3878bc121a15464363c71ffdf99b5
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 23:27:01 2012 +0000

    Changed config.yaml file loading to only occur once per run. Cleaned up logging of timeout values.

commit f7b15996a33333636d8006bf44bdba2428aa6962
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 23:03:38 2012 +0000

    Bumped version number to 0.3.2

commit f36603abe7e2b21a0489d12d051afaec67e5fd44
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 19:08:04 2012 +0000

    Added wait_for_server_to_be_operational_with_dns wrapper method.

commit a454757adbdf0d7e730c25ff1841b7209585f7de
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 18:15:27 2012 +0000

    Fixed missing "_timeout" issue and added more comments.

commit 520a695b46a564d465ca93e0ebc9b81a32cdce04
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 17:23:53 2012 +0000

    Refactored get_timeout_for_state to simplify it.

commit 1547efb05b1e162e86ea75d03f3473d1c2e8ecd8
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 01:18:08 2012 +0000

    Added rest_connection wrapper wait_for_server_state.

commit 2f31d68b9eab06708b0a73409d6619c88c78b62c
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Wed Feb 29 00:18:19 2012 +0000

    Fixed typo and refactored a little.

commit 06f3b5926c9edbe3fe9f169eb2a0b86ee9fd0342
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Tue Feb 28 23:28:32 2012 +0000

    New timeout logic. Code complete sans command line overrides.
Fixed pre-commit script to work in a degraded fashion on the Mac.
Merge branch 'master' of git://github.com/rightscale/virtualmonkey
Updated timeout and instance throttling settings to more usefull day-to-day values.
Reordered timeout values.
Merged 0.3.3 into master, squashed commit of the following:

commit 990f75554a9cf0b4b42d68456f68b7d20c46aa72
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Thu Mar 22 17:00:46 2012 -0700

    Fixed problem Efrain found where two completely different monkey jobs ended up generating the same report URL. The fix was to add a random number between 0 and 100,000,000 to the url which uniquely identifies the report.

commit 5d7cf4879d836e71291541e166ffe03a9a5dd963
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Thu Mar 22 08:49:57 2012 -0700

    Added comment showing where the web server is launched.

commit b1c3a9d3d7bc908f7195e6775e7744c7f3d3dfec
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Thu Mar 22 05:42:25 2012 -0700

    Moved SSL certificate stuff to /etc/spidermonkey

commit ecdcc6586c3718feffccea4a966a221a1ba774e2
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Wed Mar 21 18:27:47 2012 -0700

    Converted tabs to spaces.

commit 32e5478d85ec1ba32d0772fd4cf910ef91811297
Author: Jon Marinello <jon.marinello@rightscale.com>
Date:   Thu Mar 22 00:51:48 2012 +0000

    Added shell script to generate SSL key and certtificate files for the spidermonkey and fixed up sinatra_app.rb to use them.

commit e0a8caba72c6ecf4cad5e625dd007cd854dad77d
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Wed Mar 21 17:09:46 2012 -0700

    First cut at adding SSL.

commit 54bf39982e8873cecb372eeee22651593079de93
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Wed Mar 21 13:08:42 2012 -0700

    Commented out the delete and improved what is printed out

commit 75054438a3ba7cc0cbbb91bec3a76be343328720
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Tue Mar 20 13:32:29 2012 -0700

    Implemented Add --throttling flag to virtual monkey to remove run coupling from the --report-metadata flag feature.

commit b41cafcfe0d44fb44152ddb8667b6a107cdcb592
Author: Jon Marinello <jonmarinello@gmail.com>
Date:   Tue Mar 20 13:31:23 2012 -0700

    Bumped version number to 0.3.3, implemented Add --throttling flag to virtual monkey to remove run coupling from the --report-metadata flag feature.
Merge branch 'master' of git://github.com/rightscale/virtualmonkey
committing branch with changes to work on rackspace managed
committing with changes for rackspace managed
Add $ to regex when looking up scripts so we don't match longer names, (for example, do_primary_restore should not match do_primary_restore_and_become_master)
Remove the $ from the first regex, which is being used for scripts not recipes.
Another fix needed for the wrong recipe calls.  Sometimes the recipes that don't match fall into the rightscript 'else' clause.  To keep this from happening, adding .*]$ since all rightscripts end in a ]/
Still getting failures on some script lookups.  This was tested and seems to be more reliable.  All scripts seem to end in rc.
adding hp and openstack kvm cloud to uses_swift function
Squashed merge of RocketMonkey into Master. This commit contains the initial implementatiomn of the rocket monkey Version 1.0.27.
Bumped Virtual Monkey version to 0.3.5 - Rocket Monkey merged into master.
Updated tests for qaweb.test.rightscale.com domain name.
Enabled RAX.