Merge pull request #1 from louh/master

Merging changes to cfa master
remove plugins.js?