Slightly experimental cleanup of some ugly code.
Cleaned up some ugly code in the edit method.
Merge branch 'development' of github.com:aheward/kuality-coeus into development

* 'development' of github.com:aheward/kuality-coeus:
  Cleaned up some ugly code in the edit method.
  Slightly experimental cleanup of some ugly code.
Removal of the coding equivalent of the human appendix.
Removal of the coding equivalent of the human appendix.
Merge remote-tracking branch 'origin/development' into development
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development
Merge branch 'development' of github.com:aheward/kuality-coeus into development

* 'development' of github.com:aheward/kuality-coeus:
  Removal of the coding equivalent of the human appendix.
  Removal of the coding equivalent of the human appendix.
Developing scenarios that will successfully submit proposals through to s2s