Merge branch 'kyle'
updated a bit of the readme, waiting on the finished plugin.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into kyle