updated version strings
updated for 1.2.1-dev
Merge pull request #9 from gregcaporaso/1.2.1-dev

updates to code for the transition to 1.2.1-dev