update dhcp db
Merge branch 'master' of github.com:kronick/slow-internet-cafe
Merge branch 'master' of github.com:kronick/slow-internet-cafe
Fixed initial bugs in swap
Merge branch 'master' of github.com:kronick/slow-internet-cafe

Conflicts:
	proxies/swapproxy.py
Fixed swap padding