removed default.html, and any pages that still pointed at it now point at 'plain.html' to stop 'make watch' breaking
Fixing merge conflict
Merge pull request #176 from gocardless/removing-default-template

removed default.html, and fixed resulting breakages in older pages