Bumped master to ruby_2_1

(see commit messages)