Code looks good

Squashed commit of the following:

commit be498844b04963b9f2f8c7d37489b81bf78ee47a
Author: Shannon Byrne <s.byrne2254@gmail.com>
Date:   Tue Jul 23 10:45:11 2013 -0500

    Added calcluate distance method