added some basic protractor tests for cities, slightly modified city.html to make use of protractor tests, modified protractor.conf.js to run tests in both firefox and chrome.