Fix subbing similar path names while generating sprite map
Merge remote-tracking branch 'puffy/master'
Move test to it's proper location