Cleaned up and added new icons to the comments form

This request to merge into the 3.0-wip branch includes two things:

* General clean up of the comments form code
* Adding new icons to the form

before
![before](https://f.cloud.github.com/assets/3453188/652185/a006c63c-d498-11e2-8b81-e00db3da0a27.png)

and after!
![after](https://f.cloud.github.com/assets/3453188/652186/a82432e6-d498-11e2-909f-94ff185a4def.png)

(fyi: I forget I had this in my repo and didn't make a pull request for 15 days)