Removed old dotfiles
Added new dotfiles
Merge branch 'update'