Conflicts:
	Popup.m

Conflicts:
	Popup.m

Bring over environment setting code from master branch to avoid duplicate env vars in 10.10 (possibly an OS bug, but better safe than sorry).

Reduce max length for custom actions to 400 bytes because some regexes are very slow. See issue 3056

Handle inserting emoji text in mavericks with cmd-ctrl-space, which sends an attributed string to -insertText:

Fix race condition that threw an exception in ProcessCache when getNameOfPid:isForeground returned nil.