update rubocop and fix new warnings

* add new line at end of files
* remove redundant hash brackets
fix case-sensitive org intersection

Signed-off-by: Glenn Oppegard <goppegard@pivotallabs.com>
fixed style errors in pr/25