allow rubber to connect directly to instance in addition to use through vagrant commands
add vagrant for integration testing
Merge remote-tracking branch 'origin/master'
web proxies should not have underscores in hostname
Merge remote-tracking branch 'origin/master'
make staging_roles more explicit
fix dedupe of serial roles
Added an env var check to prevent a dist-upgrade during bootstrap, since this could pull in a new kernel on people that don't want one.
Hopefully fixing a problem I introduced in 74d5831310fce5b070ea6f7493e8f88db2f6213f whereby I was clobbering any cap task that had an :only option supplied.
jruby-head is about to get rocky, so allow failures on it.
It seems rbx-18mode is having problems after some rbx upgrade on Travis.
fog 1.16.0 has problems that we need to work around, so lock down fog in the interim.
Added cleanup hook for 'vagrant destroy' for Vagrant version >= 1.3.0.
Cleaned out some Vagrant config junk.
Preserve the  value across multiple calls to `maybe_reboot`.
Preparing the 2.5.5 release.
It seems I always miss at least one CHANGELOG entry.
Enhances database.yml to respond to active environment, not just 'production'
Merge pull request #403 from bikeath1337/mysql_db_adapter

Enhances MySQL database.yml to respond to active environment, not just 'production'.
Merge remote-tracking branch 'upstream/master'