Corrects formatting for rubocop; removes :focus tag

This commit correctly aligns text per rubocop. It also removes a focus
tag that was causing some (currently xit ignored) tests to be skipped.
Merge branch 'fix-rubocop'