rm the tilde files
Merge branch 'master' of github.com:usdivad/discourse