Switch to IndentLine from IndentGuide
Merge branch 'master' of https://github.com/lespea/configs