Merge branch 'httpgw' of git@github.com:gritzko/swift