Make it possible to choose the bouncing type for dock icon (once, infinite).
Clean up PTYWindow
Hide hotkey window when no iterm window is main or when another terminal window becomes key. This allows things like clipboard managers (which don't affect the main window) to not dismiss the hotkey window, but switching terminals or going to another app will hide it. Also fix a bug where the menu bar wasn't hidden when toggling a fullscreen hotkey window.
Hide the menu bar when switching from settings to fullscreen hotkey window
Fix UKCrashReporter for OSX 10.7+ (yikes)

Conflicts:
	UKCrashReporter/UKCrashReporter.m
Merge branch 'master' of https://github.com/fmichea/iTerm2 into fmichea-master
Minor clean up of pull request 165. Add -defaultIndex method to Trigger subclasses that let them specify the index of the default parameter value.
Merge branch 'master' of https://github.com/gnachman/iTerm2
Add hidden pref for anti-idle timer period
Fix bug where the dimmed background wasn't drawn below the scrollview. Also clean up background image drawing and snapshotting.
Retire the 'closing hotkey window switches spaces flag'.
Turn off content shadow only when there is a transparent window. Fixes issue 2925.
Split up compount pref for compact tabs into separate prefs for hide tab close button and number. This will reset everyone's prefs since they now default to off, which is the better default.
Allow key actions that select a menu item by name to select alternates as well. Fixes issue 2920.
A start at a floating instant replay controller
Make switching to traditional fullscreen change the window style mask instead of creating a new pseudoterminal. It was done that way because older versions of Mac OS didn't support changing the style mask.
Git rid of WINDOW_TYPE_FORCE_FULL_SCREEN
Fix merge conflict
Take a guess at an appropriate window frame size when exiting fullscreen for a window that started out as fullscreen, based on the preferred size set in the current session's profile.
Fix up initial frame of instant replay. Try to change its cursor into an arrow but the OS doesn't respect the wishes of non-key windows.