Getting rid of the "More" drop-down menu on the annotation

This change gets rid of the "More" drop down menu and instead replaces it with the edit and delete buttons. It now looks like this:
![newannotationmenu](https://f.cloud.github.com/assets/521978/764838/93416d36-e81a-11e2-8636-3d016b725d7d.jpg)


This is a fix for GitHub issue #476.