Squashed commit of the following:

commit 166ef152dcfa18e94d74329ff41a77bc6628297a
Author: David Goehrig <dave@dloh.org>
Date:   Fri Sep 5 19:44:41 2014 -0400

    Now builds on Linux, but image doesn't load to to address issues

commit 2d324fef65a999ca61ce1db8df498c9d40ceee92
Author: David Goehrig <dave@dloh.org>
Date:   Fri Sep 5 19:22:43 2014 -0400

    starting an unknown branch because I don't remember what I was doing