Made settings a little prettier
Fixed problem with Jackal not merging URI when function called directly
Changed help to use asciiTree
Merge branch 'dev' of github.com:tarwich/jackal into dev