Adding spring security to the mix, starting to clean up templates...

May have broken a couple of things, but started to clean up code base...