Convert old-style collections import to new std::collections
Merge pull request #122 from funkenstein/master

Convert old-style collections import to new std::collections