CB-7056 serve: return promise of server

+ restore serve tests

This fixes a regression from:

    Update "cordova serve" to work with promises refactoring
    apache/cordova-cli@d3b329277209d8863507f3b8bf0bad11e73736ef
    Oct 3 14:27:53 2013 -0400