fixing analytics script inclusion
removing debug stuff
changing models for new site
resolving conflicts