make fresh config detect more pieces before loading them
Merge branch 'master' of https://github.com/adamcstephens/dotfiles

Conflicts:
	freshrc