Fixing delimit mate bug, adding pryrc
Merge branch 'master' of github.com:JohnMorales/home

Conflicts:
	makesetup.sh