chg gitmodules and neobundle subm to track neobundle origin/master

Conflicts:
	.gitmodules
make 10-haskell track origin/master

Conflicts:
	.gitignore