combined commits for `develop`

I've combined Mike's, Charles' and my commits/PRs and prepared this branch for merge into `develop`.

Known issues (as of ML nightly 2014-11-16):

* logout -> cannot read property 'name' of undefined: #248 (this may be intermittent)

I'm going to merge this now, just doing a PR for documentation purposes.