Couple quick tweaks for setting up
Merge pull request #1 from gkoehler/master

Couple quick tweaks for setting up