Vpc

This is a pretty major overhaul. Moved all the tests to Tap and added VPC support. Also, changed some of the config parameters.