This should already be in there.. I'm working through the travis issues. After I push today, can you rebase this branch?