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
merge from develop