i3config + not hidden files
Merge branch 'master' of github.com:alexpatel/dotfiles

Conflicts:
	vim/bundle/ctrlp.vim
	vim/bundle/nerdtree
	vim/bundle/syntastic