Changing DIST TO precise and trusty

Conflicts:
	config.xml
Added opengeo-tomcat7 job, disabling opengeo-tomcat6
Adding BRANCH parameter to jobs
Update build email address