- FIX: fixed system name
Merge branch 'master' of https://github.com/zphr/.emacs.d

Conflicts:
	.gitignore
- helm integration