Merge pull request #364 from dhaskew/master

Added basic link between Supply / Country
Merge pull request #366 from jamesdabbs/master

Make auto_archive check more defensive
Update README.md
Update README.md
removed .rvmrc
Updated Gemfile to ruby 2.1.4
Updatd .ruby-version to 2.1.4
PCMO role can now manage supplies for her country.
Merge branch 'supplies_mgmt' of https://github.com/dhaskew/medlink into dhaskew-supplies_mgmt
Minor test cleanup

The held `cbox` reference seemed to mask the actual test, since it
wouldn't necessarily re-find the checkbox on the new page. This extracts
a (hopefully slightly more readable) helper function.

Also, trimmed some trailing whitespace.
Bump rvm version for Travis

The build was erroring because the .travis.yml and Gemfiles specified
different versions.
Merge branch 'dhaskew-supplies_mgmt'

Allows PCMOs to manage which supplies are available in their country
without needing admin access.