second pass
Merge branch 'haproxy-grammar' of github.com:davidbirdsong/lua_sandbox into haproxy-grammar

Conflicts:
	modules/common_log_format.lua