Updated the version number and removed some bits on the extra plugins that we are not currently using.
Merge origin/master