Ignore node module dir
Clean up theme related
Merge branch 'master' into gh-pages