Correct substatement indentation in c-mode (fixes #342)
Add prelude-duplicate-and-comment-current-line-or-region (fixes #348)
Disable multi-web-mode in PHP-mode
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	README.md
	modules/prelude-c.el