updated submodules / added vim ack
added scala vim bundle use ctrp quick fix for ack
Merge branch 'master' of github.com:williscool/my_confs

also add nginx confs

Conflicts:
	.gitmodules
	tmuxinator/example.yml
	vimfiles/vimrc