Edit button and cancel buttons now swap properly
Merge branch 'edit-comments' of github.com:bdickason/shots into edit-comments