switched default guest port to 3000 (was 5000 for foreman)
Merge remote-tracking branch 'origin/master' into base_ruby_environment