Add error message to waitUntil in UI tests

Give the user the option to add a message to display if test timeouts during a waitUntil. Also fixed small typo where we confuse milliseconds with seconds.

@rev gtorres@
Merging origin/tbliss/master-pending-add-error-msg-waitFor into master