fixed vim colorscheme updated to docker for mac
Merge branch 'master' of github.com:/iboard/docker-workstation

Conflicts:
	Dockerfile
	project_source/Gemfile
	project_source/Gemfile.lock
	project_source/spec/docker/integration_spec.rb
	project_source/spec/spec_helper.rb