First attempted cleanup for simple_bridge 2.0
Fix generation for inets. Add simple_bridge_callout module
Change ws dependencies back to github
Merge branch 'master' into ws
Ignore deps dir
Set up WS stub. Update for Cowboy 0.9.0
Fix full releases in makefile and travis
Ensure `make` properly clones the 'ws' branch
Merge branch 'master' into ws

Conflicts:
	CHANGELOG.markdown
	Makefile
	rel/overlay/yaws/etc/yaws.conf
More migration from callout to handler
Merge branch 'master' into ws

Conflicts:
	Makefile
Fix travis build
Ensure target exists. Safer re/nitrogen. More msgs
Merge branch 'master' into ws

Conflicts:
	Makefile
Merge branch 'master' into ws

Conflicts:
	rel/overlay/webmachine/site/src/static_resource.erl
Avoids errors with update-deps
Merge branch 'master' into ws
changed bin/dev script to make it compatible with Windows msysgit shell
Merge pull request #72 from fooflare/master

Avoids errors with update-deps
Merge pull request #76 from aseidlitz/win-support

Changes to bin/dev script to make it compatible with Windows msysgit shell