latest windows changes
Change staging startup script

  * removed the redirection of STDOUT and STDERR to log files as this break warden streaming api
  * cleaned up the HEREDOC
  * inlined unnecessary method calls in HEREDOC

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>
Update Java buildpack

This change updates that Java buildpack to its latest commit.  This
brings in changes to the versions of Java 1.7 and Spring Auto-
reconfigure that are used by the buildpack.

[#52066937]
tee the startup script output to logfile and STDOUT/STDERR

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>
ignore .iml files

  helpful if you want to look at the go in IDEA

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>
Merge pull request #31 from cloudfoundry/staging_plugin_startup_script_cleanup

Change staging startup script
Merge pull request #32 from nebhale/52066937-update-java-buildpack

Update Java buildpack
Merge branch 'master' into ironfoundry

Conflicts:
	.gitignore
	buildpacks/vendor/java
Merge remote-tracking branch 'origin/ironfoundry' into ironfoundry-socketUri