Add tests for indented syntax and some tweaks
Merge pull request #514 from kevva/test-indented

Add tests for indented syntax and some tweaks