fix minor typo
Merge pull request #6 from fretscha/typo_fix

fix minor typo
Update README.md
Large pack of changes:
* rewrite settings page
* implement departments handling
* department switcher
* reformat source
* rewrite tests to use factory_boy
* lots of user/permission improvements
Add guardian to requirements
Environment model refactoring
Temporary disable environment test
Merge pull request #1 from Eyjafjallajokull/master

merge from upstream