add web-mode
personalized settings
load web-mode profile
Merge branch 'web-mode' into working
Merge branch 'working'

Conflicts:
	config/linum.el