added tmux to pkgs
updated tm_properties with filetype for .cap
removed nerdtree dep and use netrw instead
better netrw config
added source-highlight package for asciidoc highlighting
removed source highlight and task
added pygments
added gut to fix gituser
added alias for extip
Merge remote-tracking branch 'upstream/master'