Squashed commit of the following:

commit becdcbd2833c8bfbc6454346d298bfa46ee6ea9f
Author: zackhehuman <zack@zackthehuman.com>
Date:   Mon Apr 28 23:04:11 2014 -0700

    Fixed Apple/Map build
Merge branch 'master' of https://github.com/zackthehuman/SubmarineOfDeath into zackthehuman-master