Squashed commit of the following:

commit 37e5cf81305652f7a429abf002ba5c8ec412930f
Merge: 6c194b6 88ed0a4
Author: Matt McQuarrie <matmcq@gmail.com>
Date:   Fri Oct 11 11:45:41 2013 -0600

    fixed merge

commit 88ed0a429a0feb894e92cbe8e5b51d39a0b51c93
Author: Carl Lange <carl@flax.ie>
Date:   Fri Jun 28 18:01:00 2013 +0100

    prints files and numbers like './build.md:70'