Merge pull request #4 from valhalla/kk_loki

updates to config handling in pathtest
Merge pull request #5 from valhalla/kk_loki

update pathtest/thor to use loki
Merge remote-tracking branch 'origin/master' into thor_incdep