Added instahook to list of dependencies.
REsolved merge conflicts.