Re-added powerline, moved some testing configs into main config.