Clean up whitepace mistakes in last commits
Update to latest plugin_launcher code to match master