Merge of code.google.com/goweb and the jaredwilkening/goweb