Fix for 187 and 200

Fix for https://github.com/fle-internal/ka-lite-central/issues/187

![selection_092](https://cloud.githubusercontent.com/assets/1319950/4494626/bdc4b6ca-4a53-11e4-967d-fe7c7a1f4ca9.png)

Fix for https://github.com/fle-internal/ka-lite-central/issues/200 (base url redirects to org management page if user logged in)