First steps in rebasing https://github.com/xdissent/sails/commit/794fedc46a9ee8f40a2a60252746bbd46ffb1a89