Merge remote-tracking branch 'dean/master'
Tweaking progress meter
Merge remote-tracking branch 'patrick/master'
Adding in an abort flag so that long processes can be cancelled
Merge branch 'master' of github.com:patrickdemond/Alder
Merge remote-tracking branch 'patrick/master'