Resolves merge conflicts and adds maven pom.xml

 I've attempted to resolve conflicts with Anwar's reverse_http here, and added support for building via maven. @timwr please take a look when you have a chance, thanks!