Updating dotfiles for 2014
Fixing conflict