Update test_user_can_click_back_from_settings_page to login from settings page
Add waits to deal with local intermittent failures
Changing the locator strategy due to a saucelabs error
Fix settings button locator
Merge pull request #233 from bobsilverberg/settings_fix

Update test_user_can_click_back_from_settings_page to login from settings page