Support ruby 2.1.4
Rubocop cleanups