changed to std::sort
added a space
adding std:: before sort
std:: before sort
Tweaking matcher; should make these things configurable
Small fixes in Bootstrap