Pr 183 merged

This is #183, with master merged in, and with qless-core updated to the latest.

I'm going to review this and the qless-core PRs some more and then hopefully merge here in a bit.