added coloresque submodule/plugin, PxToEm helper function
Merge branch 'master' of github.com:acepukas/vimconf

Conflicts:
	.vimrc