Remove mix of tabs and spaces in favour of just spaces.
Refactor into Grape helper.
Add integration tests.
Merge pull request #2 from parkr/refactor

Refactor