A few fixes for ruby 2.x

Note that the version of rb-readline we bundle is still broken on 2.x, so to do any kind of work with 2.x you'll need to start `msfconsole` with `-L`.

## Verification
 - [ ] green travis