"HEAD"=>{branch, master} and official pmod_transform
Make logging work with inets
Fix binary conversion loop, and firefox ws
If mimetypes doesn't exist, set up basic mimetypes
Merge branch 'ws' of github.com:nitrogen/simple_bridge into ws

Conflicts:
	src/inets_bridge_modules/inets_simple_bridge_sup.erl
Rework websocket handler to track state
Rework Cowboy bridge to support websocket state
Fix yaws websocket bridge to track state
Update readme with recent State changes
Update changelog
Uodate deps. Fix sha warning in webmachine
Merge branch 'master' into ws

Conflicts:
	rebar.config
Fix indentation inconsistency (major change, yo)
BAH! Fix typo in sbw:cookie/2
Added support for X-Requested-With header
Merge pull request #36 from ilyashuma/master

Added support for X-Requested-With header
Merge branch 'master' into ws

(This is merged in to avoid any other merge conflicts going forward)

Conflicts:
	src/misultin_bridge_modules/misultin_request_bridge.erl
	src/mochiweb_bridge_modules/mochiweb_request_bridge.erl
	src/webmachine_bridge_modules/webmachine_request_bridge.erl