Formatting.
Merge branch 'develop' of github.com:diwa-aalto/diwacs into develop
formatted setup.py (import guard etc).