visual mergetool

* always ignore git's mergetool temp files
sort ignroed types
colon-indenting hack
shorter alias for undo
ignore host keys
2-space tabs in st2
sort ignores
ignore unversioned executables
fish and accompanying basic functions!
bundle exec fn
update ST2 plugins list

plus configs for:

* counting words
* tabs to spaces
rm broken vim map + old completion setup
+sbin in path
improve ST2 look and feel
notes on prompt
hub alias for git; nb hub -p for private
indentation
new vim mode from tpope for running git commands
resolve merge conflict
handle jade templates (JS)