Conventional naming for diff modes.
Disable rake color output unless connected to TTY
Wiki page url changed due to title cleanup.
Button name has an upcase in it.
Unsupported is unclear.
Merge branch 'unofficial-is-unclear' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhq
Merge remote-tracking branch 'origin/side-by-side'

Conflicts:
	CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>