Fixing up analysis templates, adding new page for development stuff
Fixing odd conflict