Rename electric-complete to skeleton-complete
Fix user.email for my repos.
Merge branch 'from-mac/00-26-b9-7a-83-c5-baohaojun-Linux' of http://github.com/baohaojun/windows-config into HEAD
should start ``contributing'' again
Fix git-pull-mac, so that the master branch also get merged
Fix git-pull-mac
Fix git-pull-mac
Merge remote-tracking branch 'remotes/origin/master' into HEAD

Conflicts:
	doc/baohaojun