merged in function name changes from gh-pages
removed autofocus from second form
got rid of autofocus from second form -- mergin in master