update to Rails 4.1.6, small lint style corrections