Added indecies to #map and #filter, added tests for #map
fixed conflicts
Merge branch 'Hypercubed-feature/indecies'