ruby 2.1
removed flag link
Merge branch 'master' into develop
Added guard supplemental gems to Gemfile, fixed weird guard exec errors.