Tidy ups

This mostly a code tidying PR; indentation, whitespace, and wrapping long lines. 
Some of these are subjective, and as such you may not agree with them, thats fine, I was working on some other changes in your gem, and thought I'd separate this out to check if your happy with it.

Other small changes include
1. Only rescuing from the error you expect
1. Some rspec syntax sugar changes
1. Removed 1 dup spec