Switch from .rvmrc to .ruby-version
Merge branch 'master' into from-shapes
Add a fast ImageShaper that works on PImages
Only trim some trailing whitespace. Thanks Sublime.