CCI-MOC/haas — pull request #110 by zenhack (2014-06-20 19:16:08+00:00)
Title: Too many things at once.

A big pile of changes; as per our discussion today we're just going to treat this as mainline, and we'll do codereview going forward. Going to merge without waiting.