merge...
Merge branch 'setup' of https://github.com/boombastech/cloaked-wookie into setup

Conflicts:
	src/main/java/uk/co/boombastech/servlets/PresenterServlet.java
	src/main/java/uk/co/boombastech/uris/UriFor.java
	src/main/java/uk/co/boombastech/wiring/PathManager.java
Freemarker Templating Implemented