Have socket.io listen on feather server port
Pass in config options to socket server
Use cached server object instead of passing it in
Merge branch 'master' of github.com:theVolary/feather

Conflicts:
	lib/socket.js
Client widget.render returns old and new containers to the callback
Don't append a port for socket.io resource if 80 or 443
Merge branch 'master' into andy_master
Merge branch 'master' into andy_master
make socket.io stuff work on mirror when using SSL
get rid of elementMap stuff in widget client (not meant for master yet)
Merge branch 'andy_master'
Merge pull request #192 from ryedin/master

merge Andy's socket.io branch + make it work across mirrored SSL configuration
Merge pull request #193 from skrenek/master

Removed pagination support from list function, as it is untested and we have no need for it right now.
Add widgetRoot to widgetClass for later reference.
Add support for packaging additional css and js files in a widget's folder.
Merge branch 'master' of github.com:theVolary/feather