Squashed commit of the following:

commit 18bc992accbc29dea7e888e3eea924df4c912e52
Author: Zack Mulgrew <zack@zackthehuman.com>
Date:   Sat Nov 1 20:36:09 2014 -0700

    Updated source files to v3.0.5