Modified the argument names and HTML structure of OpenntfServlet slightly, for good measure.
Merge remote-tracking branch 'origin/jesse' into nathan