added username to lin alias
merged
cleaned up, added zoo_config, added pathogen.vim and nerdtree
merged with zoo changes