versioning
Merge branch 'master' of github.com:OpenSextant/opensextant

 merging to catch up; 24jun