Merge branch 'master' of github.com:cbeach/Configurations

Added jsLint submodule, and vim/jslintrc

Conflicts:
	.gitmodules
	puppet/modules/dev
	puppet/modules/dev_tools/manifests/debugging.pp
	puppet/modules/dev_tools/manifests/profiling.pp
	puppet/modules/web/lamp/manifests/init.pp
	puppet/modules/web/lamp/manifests/my_sql.pp
	vim/bundle/PySmell
Adding some webdev modules.

Prepairing an environment for github service hooks.
Working on GitHub hooks.  Commiting to test a push hook.
Merge branch 'master' of github.com:cbeach/Configurations

Conflicts:
	gitHubServiceHooks/push.py
	puppet/modules/dev
	puppet/modules/dev_tools/manifests/debugging.pp
	puppet/modules/dev_tools/manifests/profiling.pp
	puppet_modules/dev_tools/manifests/git.pp
	puppet_modules/dev_tools/manifests/init.pp