Local.js needs to specific all adapter settings

This is a bug in sails; it should merge the adapter settings
from config/adapters.js with those in config/local.js.
Unfortunately it doesn't do that.  For now, put all the
settings in local.js so that we're sure they're used.
Reset requirejs to the `latest` branch

Not sure if this is causing problems, but just to
be sure, only use the `latest` release of requirejs.
Hotfix merge for problems deploying