No need to explicitly require rubygems
Merge remote-tracking branch 'upstream/master' into cybernetic-police
Bump ruby version to 2.1.5
Add task for easily running Rubocop
Clarify intent
Disable Style/Documentation cops

This could be enabled when classes are properly documented.
Redundant `return`
Updates for rubocop
Add guard clause
Remove rogue private
fix self assignment and line length offenses
Remove redundant curly braces and `return`
Use `fail` instead of `raise` & shorten a few long lines
Whitespace.
A number of changes...

- Fail early instead of using nested conditionals. IMO this reduces visual complexity and rubocop is happy because the method is significantly shorter
- Created a private method expliclitly for getting salty passwords
- Not sure about the use of `next` so leaving it alone for now
Adding 2.1.5 to travis