Update README.md & post-install configuration files
Merge branch 'master' of https://github.com/moriame/ubuntu

Conflicts:
	12.04/README.md