Merge pull request #59 from donaldsharp/cli_cleanup

Cli cleanup, largely VNC related, minor bgpd/ospfd/lib fixes.

diff --cc bgpd/bgp_mplsvpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc vtysh/extract.pl.in
Simple merge