Merge branch 'master' into develop
Reorder functions in main.go and file.go

Reorder functions so that ones that operate on a file exist in file.go
and helper functions exist in main.go.

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'develop' of github.com:vendion/trashctl into develop