updated to latest versions of modules
disable oauth by default
shrinkwrap dependencies
get rid of old image
merge from upstream