add org-mode bindings
Merge branch 'master' of github.com:jffjs/spacemacs.d

Conflicts:
	.spacemacs