updates to make the tool more command-line friendly: named parameters, etc
fixing a merge conflict
Merge branch 'master' of https://github.com/aaronmck/DeepFry