updated readme to reflect new plan
merged dev into master