Updating fdotfiles
Merge branch 'ubuntu' of http://github.com/javiacei/dotfiles into ubuntu

Conflicts:
	vimrc