Merge branch 'master' into gh-pages
removing merge conflict
autofocus doesn't make sense until the textarea is working
Merge pull request #2 from origamike/gh-pages

resolving merge conflict HEAD text