Config Manager updates

Please review – and wait for Travis :)