added hidden read-only pk entry to AtomForm
add/edit/remove atom interface works without bad db code
cleaned up forms a bit more
let's try adding a field to ConceptAtom model..
lets try that again..
successful south migration...i hope
multiple choice merge form select field prints
get merge gets the queryset the user selects
two submit buttons trigger different handle() cases
error prints (badly) if atoms are not checked or both/neither
new/existing atoms are selected
fixed queryset logic for getting unmerged/merged atoms
added db code to create/edit merges
renamed pruning to merge, deleted debugging prints. still get duplicate
error messages
Created UpdateMergeForm. it renders dependent merge atoms.
deleted comment code, tightened up editformset creation
Merge branch 'master' of http://www.github.com/kevincwebb/conceptum
added redirects to support edit vss new merge forms
redirects were broken, they work now. temp debug code added
edit merge atoms now show atom titles
update merge db code written