remove git merge shit
added reveal.js support
added go staff
changed space indent from 8 to 2 for go-mode
rewrite some keybings -a