[.gitconfig] Add color "diff" section.
[.bashrc] Add the alias "fcn" and set the default editor.
Merge branch 'master' into linux

Conflicts:
	.bashrc
[.gitconfig .gitignore] Remove unnecessary [color "diff"] and add '.gitignore'.
Merge branch 'master' into linux