Changed setup.py
Fixed setup.py merge conflict
Merge branch 'hotfix/check_setup' into develop
Small changes
Changed behaviour so that annotating models are optional
Merge branch 'feature/fix_phasing_problem' into develop
Changed README
Changed readme and bumped version number
Merge branch 'release/0.2'