Remove another annotation= attribute

Hopefully really fixes gh-151
Add instance id suffix to Tomcat Engine name

Fixes gh-160
Fixed two typos in README.md

Fixes gh-157
Fixed several typos in CONTRIBUTING.md

Fixes gh-158
Allow use of underscores in @ConfigurationProperties prefix

Currently the PropertiesConfigurationFilter filters them out.
Thus when deploying to IAAS these environment variables are ignored.

Fixes gh-154
Only log startup info (PID etc) for root context

Fixes gh-153
Fix @Conditional for Batch command line runner

Previously it was @ConditionalOnMissingBean(CommandLineRunner.class)
which caued obvious problems when user wanted to add an unrelated
CLR.

Extended feature set so that a JobRegistry can also be used (with
spring.batch.job.name) and the whole idea can be switched off with
spring.boot.job.enabled.
Auto configuration support for JMX export
Prevent cryptic exception if SecurityProperties not created

Previously if a user happened to provide an @EnableWebSecurity bean
the SecurityProperties would not be created, which is fine until you
add the Actuator (which needs them). Fixed by adding an explicit
SecurityProperties @Bean if not already present.
Upgrade Jackson
Add extra condition to security properties config
Allow default DispatcherServlet to be switched off more easily

All a user has to do now is declare a bean with name "dispatcherServlet".
Enabled JMX export auto configuration by default
Upgrade Spring
Document switching off DispatcherServlet
Prevent type not present exception when no security on classpath
Merge pull request #1 from spring-projects/master

2