Consisency fixes.
- Removed "if surprise"
- Using || instead of or
- Using parenthesis for methods arguments
- OptionsHelper uses instance methods
Better Rakefile and Rspec usage