swapped keyup for HTML form

Removed the keyup event by inserting form into HTML.  This makes the
enter key work flawlessly.
Merge branch 'master' into gh-pages