Updated analytics

Updated to use universal analytics, tidied code and added a little
bootstrap code