diffmerge version bump
updated python, firefox and changed adium to githubs boxen repo