Several small improvements.

I did a little work fix some of the open issues. Specifically these changes will fix issue #14 and issue #15. It's also worth pointing out that issue #2 and issue #11 were fixed in earlier releases, so the total number of open issues should be zero. I know there are other issues that aren't currently documented. I'll try to add some when I get a chance.

I also finally found a solution for not indenting after a single line where statement! So the line after a where should only indent if there is nothing (other than a comment) following the initial where statement.