Update version to 3.1.1
Updated splash screen and installer to just say "Aptana Studio 3" 
Possible fix for APSTUD-4517 Terminal view broken
Another stab at APSTUD-4517
Make archivePrefix and collectingFolder the same to try and fix issue seen at http://dev.eclipse.org/mhonarc/lists/pde-build-dev/msg00125.html
Argh! Make collectingFolder and archivePrefix match and be "Aptana Studio 3".
use underscores in archivePrefix/collectingFolder name or native zip complains
Squashed commit of the following:

commit 834997d8c9be46e73471ed94b958d18030b3f7ff
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Fri Mar 23 14:00:20 2012 -0400

    Don't include optional dependencies in feature or RCP builds

commit 0ba98ec53eda8b350eaa2f508828396900ca12c1
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Wed Mar 21 16:04:49 2012 -0400

    Possible fix for APSTUD-1378
    Updating to latest RCP on dev installs JDT plugins!

commit ab2dd41a37b231186b8e9d8e587fcafeaae86c14
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 19:12:44 2012 -0400

    use underscores in archivePrefix/collectingFolder name or native zip complains

commit 96948db2c52729ab09d26a05ffd5a1e584d8adf1
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 17:07:53 2012 -0400

    Argh! Make collectingFolder and archivePrefix match and be "Aptana Studio 3".

commit f284eec6ffbf6400f1f6abc601ecf69b77bd61f0
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 15:43:04 2012 -0400

    Comment out native zip properties for now

commit 060fb93565ed89c56459f8c9fe89c0a954ae7c9b
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 14:35:38 2012 -0400

    Make archivePrefix and collectingFolder the same to try and fix issue seen at http://dev.eclipse.org/mhonarc/lists/pde-build-dev/msg00125.html

commit 7484a189e15835d9d5e5d4800262d6b487dd7d2c
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 14:18:40 2012 -0400

    Related to APSTUD-4517

commit c6cb9afa367e7002e190dfaa7000e541aaadd642
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 14:15:29 2012 -0400

    Another stab at APSTUD-4517

commit d22187b8c999dcdc4f1a010d352f64d9e2a8d2b2
Author: Chris Williams <cwilliams@appcelerator.com>
Date:   Mon Mar 19 12:07:14 2012 -0400

    Possible fix for APSTUD-4517 Terminal view broken

commit 2fbd0caab020c4f8639d440192ea9ec7d452cacc
Author: Ingo Muschenetz <ingo@muschenetz.com>
Date:   Sun Mar 18 21:16:05 2012 -0700

    Updated splash screen and installer to just say "Aptana Studio 3"
Another attempt at fixing APSTUD-1378 Updating to latest RCP on dev installs JDT plugins!
Merge remote branch 'origin/master' into release
Work related to APSTUD-1378 Updating to latest RCP on dev installs JDT plugins
  - Bump up to Eclipse 3.7.2
Merge remote branch 'origin/master' into release
Move branch to 3.1.2.
Update copyright year to 2012
- Make PyDev Django sub-feature optional (maybe fix TISTUD-1516 ?).
- Remove duplicated p2.inf file
- Sign JARs in customAssembly/pre.archive rather than postAssemble, so that files in zip are signed.
- Move wiping of deploy.dir from preAssemble to prePackage
Move signing JARs to customTargets/prePackage, so we do it once for all standalones (rather than per-standalone)
Fixed the p2 category issue for Studio 3 plugins.
Added categorize ant call.
Fixed the build.