fixes conflict with indentLine plugin
Merge pull request #39 from kris89/master

fixes conflict with indentLine plugin