Merged commit 53b0f0c to fix #150

Conflicts came in from merging PEP8 first.

Conflicts:

	lib/jnpr/junos/factory/table.py