Merge branch 'master' into debian
New master code
Merge branch 'debian' of github.com:Trim/getcal into debian