Merge in some of the recent stuff + favicon!