Merge branch 'master' of github.com:novoda/merlin into merge_refactor_to_match_code_style
removing the java doc and extracting out some helper methods!
Merge branch 'master' of github.com:novoda/merlin into merge_refactor_to_match_code_style
Merge pull request #47 from novoda/merge_refactor_to_match_code_style

Applying the novoda codestyle to an external PR