stopping jetty in the puppet manifest by default

So as to not to conflict with doing a grails run-app, also removing collinson.properties
adding reset view
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop