Merge branch 'less'
revert .gitignore, 'cause I'm a better person now than I was
derp
Merge branch 'master' into less
[less] tidy up