Use default conflict style in Git
Move tmux initialization to the end of profile
Remove duplicated $HOME/bin from $PATH
Add pythonstartup to dotfiles
Remove ipdb Vim snippet as it now comes by default and add jq to html snippets
Replace vim j, k and J mappings with g versions by default
Remove old python-mode config from vimrc
Remove duplicated utf-8 setting in tmux and add setw utf8 on