Change from .rvmrc to .ruby-version and .ruby-gemset (use 2.1.0 by default).
Merge branch 'master' of github.com:kgautreaux/pillboxr