Add support for tooltip form field option
Break out tooltip attr into label and field options
Merge branch 'tooltips' into development