fixes #1469 - vlan field missing in subnets

fixes a couple of html rendering errors in views

fixes a couple of broken tests + show full error trace in development mode.

fixes #1451 - Host creation fails if ":tftp_servername:" is set in proxy-settings

fixes #1392 - change root password back to system wide defaults

rhel6 is released, remove the beta hack

Fix typo (where -> were)

Signed-off-by: Frank Sweetser <fs@wpi.edu>

fixes #1436 - error while removing puppet classes

fixes #1341 - tftp templates can now use @host as well.

fixes #1401 - smart proxies filtering. will not remember the selected filter once an operation was selected