Merge pull request #152 from eads/0.9-beta6

Clean up some formatting and directory creation