merge
updated config
rename the config var apropriately
merge and bringing up to speed
cleaning up the ns declaration
pull in admin migrations
set up for pulling in permissions on creation
core cleanup
brought development site up to new config standards, removed boot.clj from resources and installed new boot paradigm
aligned with full reloading handler
resolved conflicts
removed redundant config file
made hooks load by function, not require, and enabled nrepl connection
versions
merge from develop
updated to latest libraries
Merge branch 'develop' of github.com:antler/caribou-development into develop
new db default location
added missing nrepl dep
Merge branch 'develop' of github.com:antler/caribou-development into develop