getting guys changes
fixing conflicts
tinyGrowl fix for dependency