Don't rely on move-text-default-bindings, which has been removed upstream

Fixes #168, #169
Load magit-git-wip after magit, not directly after vc
Add site-lisp dirs to load-path after creation
Also use guide-key for narrowing map via "C-x n" prefix
Allow inline completions to cycle without eagerly popping up *Completions*
Ignore helm-adaptive-history
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore