Checkpoint, March 3rd 2014
merged
Merge branch 'master' of github.com:Soares/config.fish

Conflicts:
	config.fish