Fixed ignore file
Merge http://github.com/victorvalenca/dotfiles

Conflicts:
	.gitignore