Merge pull request #3 from snatchev/master

fix for https://github.com/haml/haml/issues/486 - indentation issue on comments
Merge pull request #4 from snatchev/master

fix conditional logic by moving it to the block opener/closer checks
Bump version, fix --version in command
Depend on Haml beta gem release from gemspec
Merge branch 'master' of github.com:haml/html2haml