Version bumps
Fix for GHC 7.4
Move CPP logic into separate module for #192
Version bump
bump websockets 0.7.4.1 -> 0.8.0.0
Relaxes upper bound on process dependency
Merge pull request #195 from argiopetech/master

Relaxes upper bound on process dependency
dependencies, replace Data.Enumerator with System.IO.Streams
websockets-0.8.0.0 compatible
bump wai-websockets 1.3.1.2 => 1.4.0.0, and shamelessly add myself to the author list
replace lift with liftIO for less dependency
cabal: replace enumerator with io-streams
update wai-websockets-example
downgrade version from 1.4.0.0 to 1.3.2.0 to synchronize with wai/warp versioning
Merge branch 'master' of https://github.com/banacorn/wai
Merge branch 'master' into wai2

Conflicts:
	wai-app-static/wai-app-static.cabal
	wai-extra/wai-extra.cabal
	wai-websockets/Network/Wai/Handler/WebSockets.hs
	wai-websockets/wai-websockets.cabal
	warp/warp.cabal