nicer naming and smoothing to individual maps
Merge branch 'auxilary' of github.com:FCP-INDI/C-PAC into newaux
Merge pull request #164 from surchs/newaux

Final merge