remove -2 suffix on date for nightly builds
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Merge branch 'master' of https://github.com/gnachman/iTerm2
Fix paths to plists in makefile