Added first pass at account activation
Added twig compilation_cache and .DS_Store to .gitignore
Detabbed the activation version
Merged conflicts from activation code with upstream