Added extra modules. Setup indentation rules.

Conflicts:
	.gitmodules
	vimrc