Merge pull request #59 from wkerzendorf/general_bugfixing

General bugfixing
Merge pull request #60 from wkerzendorf/general_bugfixing

General bugfixing
several installation issues
Merge branch 'master' of github.com:wkerzendorf/tardis
bigger favicon