added pair<int, int>
removed excessive computatuion od dst_size
Merge branch 'dbr' of github.com:cyclus/cyclus into dbr
added map<int, int> support