Merge pull request #13 from moosy/master

UPDATE: Some more small fixes, now based on beautified version ;)
Differentiate between party/pause and between holiday/vacation