Further refactoring to ensure the originating grunt is used throughout the application
Fixes a local vs remote selection bug, removes login/logout wrap around remote build (because async)