Merge pull request #6 from openconnectome/memory_usage

Memory usage
Merge branch 'master' of https://github.com/openconnectome/alignment into fpeak_selection