Cleanup as per Rubocop

* Remove redundant returns
* Clean up spacing around parentheses, braces, pipes, etc.
* Use Ruby 1.9 style hash syntax
* Single quotes wherever possible
* Remove extraneous empty lines
Use `fail` instead of `raise` for exceptions

Raise is best used when catching & re-raising an exception.