config change which should work :)
ignore vim tmp files
ignore vim tmp files
properly generate paths
Merge branch 'master' into gh-pages