added some command line flags to make everything a bit easier to configure, also fixed windows-style line endings
Merge pull request #1 from jetpacktuxedo/master

I have added some command line flags to make everything a bit more user-configurable