Added ~/bin folder to path
Merge branch 'master' of github.com:canassa/fishfiles

* 'master' of github.com:canassa/fishfiles:
  Added rbenv initialization
Merge branch 'master' of github.com:canassa/fishfiles

* 'master' of github.com:canassa/fishfiles:
  Duplicated color settings
  Removed comments, moved code from config

Conflicts:
	config.fish