Add logic to set focus back to form element on error
Remove focus handler that kills error tooltips because we are focusing immediately now
Merge branch 'master' into btimm