merge :(
Merge branch 'master' of https://github.com/damnit/configs
more less in vim