Ruby decrypt

Attempts to get my computer running with the decrypt-ruby stuff
resolving conflict
Merge branch 'master' of https://github.com/shademonkey/todos