Allow travis to build refactoring branch
Test more subcommands
Revert "Allow travis to build refactoring branch"

This reverts commit c41d88861c529fb925acb831dc9f5d0bb787a1a5.