AAdded org module and yasnippet
Few more changes.
Merge branch 'master' of https://github.com/krasm/emacsrc

Conflicts:
	.gitmodules