Squashed commit of the following:

commit d24768c78a0efbd2f71c95d3602960dc06416d23
Author: Derrick Weis <derrick@derrickweis.com>
Date:   Wed Mar 27 15:26:23 2013 -0400

    add some linear interpolation

commit 35d0a97b7c2896729b175ffcaf16722c4939452b
Author: Derrick Weis <derrick@derrickweis.com>
Date:   Wed Mar 27 12:47:35 2013 -0400

    fix some minor bugs

commit 0bdee9c938aa70de9ab8cfa3ff4e511c3e04a6a5
Author: Derrick Weis <derrick@derrickweis.com>
Date:   Wed Mar 27 08:08:22 2013 -0400

    work in progress