Dev

Don't merge yet!

Will update description later, just seeing how some test behavior with Travis works right now.