Merge pull request #1 from columbusmonkey/master

Make output directory defaults and docs consistent