Rebase to Oct 6 2014

Tests are currently failing against the XBlock SDK due to upstream changes. This rebase should fix that.