Fix merge errors, add new rule to gitignore, remove lessc, setup less.js for autocompiling.