Updated ruby version
Merging with github changes because I'm lazy

Merge branch 'master' of https://github.com/journalbits/journalbits