A few changes to numist, including virtualenv prompt support
Merge branch 'yorodm-theme'
Quitando mis archivos de duply
Merge branch 'master' of github.com:bpinto/oh-my-fish
Merge branch 'master' of github.com:bpinto/oh-my-fish
Merge remote-tracking branch 'bpinto/master'

Conflicts:
	.gitignore
Merge pull request #21 from yorodm/master

A few changes to numist, including virtualenv prompt support