Update rubocop dependency to >= 0.16
Align ends with variables in conditionals
Align whens/elses with ends in case statements