Trying to get travis to compile the branch.

Yeah, this is agitating.

No merging till green + refactor.