Separate base and mailout css
Move non mailout related stuff back into the base library
Bring changes from master branch onto unimelb branch