add memory limit
update docker-api, add memory_swap
remove container
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  remove container
  update docker-api, add memory_swap
  add memory limit
Merge branch 'master' into bebanjo

* master:
  remove container
  update docker-api, add memory_swap
  add memory limit

Conflicts:
	lib/vx/container_connector/docker.rb