Fix for infinite loop bug in layout code.
More fixes.
Merge branch 'master' of github.com:yeerkkiller1/GitLapse