Adding a couple more plugin I started using and some cleanup.