Merge pull request #101 from LabNConsulting/working/master/patch-set/3-vrf

Master version of basic vrf commands & some other missed fixes

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/rfapi/rfapi_import.c
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc lib/command.h
Simple merge