Fix a few issues
Merge branch 'master' of github.com:ace13/RubyCI