rapid7/metasploit-framework — pull request #2880 by todb-r7 (2014-01-14 17:37:19+00:00)
Title: Merge master down into unstable

Need to pick up the latest hotness, namely, .travis.yml, but surely other moving targets as well to ensure that unstable runs cleanly.

Land this so #2875 can land without freaking Travis-CI out about a bad rake version.

Again, this is targeted at unstable. Will not affect master.