for mac marvericks
modified author infomation
Merge branch 'master' of github.com:vkgtaro/dotfiles

Conflicts:
	emacs.d/conf/init-mac.el
	gitconfig