time to pull
Merge branch 'master' of https://github.com/kmjungersen/znc_admin

Conflicts:
	znc_webadmin.pyc
Merge branch 'master' of https://github.com/kmjungersen/znc_admin
updated README
Merge branch 'master' of https://github.com/kmjungersen/znc_admin
refactor socketform stuff
Merge pull request #4 from asmacdo/feature/resocket

Feature/resocket
Merge branch 'master' of https://github.com/kmjungersen/znc_admin
Added more verbose server output
Fixed issue with SockJS object not working correctly, and cleaned and organizaed existing code
Fixed a debugging error, and modifed the console logging