Update INSTALL
make IDLE_TIMEOUT a more easily configurable constant
Add hybrid VLAN routing mode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	riplpox/riplpox.py