Merge pull request #15 from dgutov/master

Improve mmm-erb usage instructions
Save values of more cc-mode variables
Remove duplicate entries

Result of some bad merge years ago
Merge pull request #16 from dgutov/c++-mode

Add cc-mode vars I missed when fixing php-mode