Upgrading Stormpath Dependency

Also doing style changes.