incorporating changes from old branch #535
Update Gemfile
update mysql2 gem to 0.3.16
merge dev to 535
Merge pull request #599 from YaleSTC/535_ruby_2_take2

update to ruby 2.1.1.