DO NOT MERGE - Use Spring security rather than Shiro.

Really wish we didn't have to do this. Sigh.