Increase timeouts for everything.me test
Merge branch 'master' into em
Return to everything.me Social screen at end of everything.me test

remove explicit timeouts that were added earlier
Move clean up code to tearDown
Merge pull request #354 from bobsilverberg/em

Return to everything.me Social screen at end of everything.me test