Add Snipmate, Change shortcuts in term and instructions
Merge branch 'master' of github.com:Oscarlsson/dotfiles