Cleanup: Enclose echo output in string

This way it gets highlighted properly and is easier to notice it.
Cleanups: Blankline cleanups
Cleanups: Use the same style for opening code blocks for if and for
Cleanups: Use 4 chars indentation for shell scripts
Merge pull request #36 from unho/some-cleanups

Some cleanups