Ammend to one commit, cleaner, and less clutter.
Merge pull request #33 from JeffScaturro/ScottFunctionalTest

Travis now makes sure the display initializes before starting Selenium t...