Merge pull request #37 from johnmyleswhite/tabs-to-spaces

convert tabs to spaces
Merge branch 'master' into testthat-fix
Merge branch 'master' into develop
Merge branch 'testthat-fix' into develop