Cleaned up some FV1.2-RC code
Merge branch '1.1-clean' of github.com:mssumanth/flowvisor into 1.1-DEV