Merge pull request #183 from bitwiseman/master

Rewrite if/else/while/do handling in js formater
Fix mis-indenting in untainted var lines

Fixes issue #184.
Add bare if-for test

Closes issue #108