Integrating changes into sidebar branch.

![rip_grand_galactic_inquisitor_by_elderwyrm](https://f.cloud.github.com/assets/452041/1693894/583f4f98-5e97-11e3-8d8f-12c862ebedb1.jpg)