Squashed commit of the following:

commit 63059694059f726343bf46d8b66e4e363d5d0a36
Merge: d296900 5a939e6
Author: matt handler <matt.handler@gmail.com>
Date:   Wed Nov 19 11:43:07 2014 -0500

    merge master

commit d29690009e3d5ad5a72328cfca6a5e6ffb0c3e49
Author: matt handler <matt.handler@gmail.com>
Date:   Wed Nov 19 02:39:26 2014 -0500

    now it works, clean up tomorrow √√√

commit 9d90561f732a266cad5c960edf5c0558ece42f7e
Author: matt handler <matt.handler@gmail.com>
Date:   Wed Nov 19 01:13:14 2014 -0500

    fix this

commit ccc66633ddc62d3bcdce6a589c443d8636327145
Author: matt handler <matt.handler@gmail.com>
Date:   Wed Nov 19 01:08:34 2014 -0500

    real solution to problem 12 in the works