Merge pull request #16 from szimmers/ticket130906_cleanup

cleanup
cleanup

- better redirection for logout