Split plugin into individual files fixes #34
Merge branch 'master' into gh-pages