Don't put Vim modeline magic in the output
Switch to Google Adsense
Merge branch 'develop'