working with new config options
removed a bunch of unnecessary cruft
new resource package for latest caribou development
merged in latest config and develop branches