Switch back to dev
Merge pull request #781 from chrisfilo/fix/back_to_dev

Switch back to dev