a lot of playing around to see if i can get the network to be stable
lock to metriks 0.9.9.5
update travis-build
Merge branch 'master' into features/docker-cpusets

Conflicts:
	Gemfile.lock
remove the arp cache manipulations