Convert indentation to 2-space
Fixes conflicts with improvements in the master branch:
Merge pull request #3 from JonMidhir/indent_with_two_spaces

Convert indentation to 2-space