added UltiSnips snippets and shortcut key
changed aliases
Merge remote-tracking branch 'origin/master'
moved commands around