added context root name to war final name to facilitate tomcat 7 auto deploy. Removed contex.xml as using war name for context root now.