Merge pull request #70 from kwilcox/master

Local file(s) support and cleanup