Minor
Merge branch 'development' into new_preferences
Workaround for issue in pytest: https://bitbucket.org/hpk42/pytest/issue/639/conftest-being-loaded-twice-giving
Providing a way to save preferences for typing.