Merge pull request #16 from openconnectome/error_opt

Error optimization
Merge branch 'master' of https://github.com/openconnectome/alignment into feature_detection