Switch header order
Improve help output
Merge github.com:william-alexander/ptrip