Fixed some problems with whitespace
Merge branch 'dev' of github.com:tarwich/jackal into dev
Added a special '_' case to the configs so that Admin can make 'foo_.yaml' files that get loaded after 'foo.yaml'.
Added a timezone setter.
Merge branch 'dev' of github.com:tarwich/jackal into dev