Fixed two issues in the 'Start a Go instance in your app' section and added some content on the CMD instruction. Issue 24 @ https://github.com/docker-library/golang
Restored comma as suggested by the code style guide, thanks tianan
Restored comma as suggested by the code style guide, thanks tianan
Restored the CMD instruction to the Dockerfile and removed the CMD instruction explanation, this is a bit of a simplification but is a simplier explanation for a newbie
Revert "Restored the CMD instruction to the Dockerfile and removed the CMD instruction explanation, this is a bit of a simplification but is a simplier explanation for a newbie"

This reverts commit 9e53ea71fa9e6f0a71a72530df8bb7c5f17515c2.
Merge branch 'master' into Issue24

Merged whitespace removal commit from upstream master, didn't think i
should rebase branch commits as already pushed commits to my forked
branch so they are public, i am new to pull requests
Merge branch 'master' into Issue24

Merged some commits from upstream master so I can push commit with
updated golang content.md and re-generated README.md
Merge branch 'master' into Issue24
Added extra qualification regarding when running the image with no arguments
Fix spurious vimdiff showing up with identical files
Merge pull request #84 from infosiftr/fix-utf8-push

Fix spurious vimdiff showing up with identical files
Add tomcat documentation
Run update.sh
Merge pull request #85 from infosiftr/tomcat

Add tomcat documentation
Run update.sh
Merge pull request #77 from pmcgrath/Issue24

Fixed two issues in the 'Start a Go instance in your app' section
edited license information

Conflicts:
	php-zendserver/license.md
Run update.sh
Add mono docs
Merge pull request #89 from infosiftr/mono

Add mono docs