Updated tomcat_mgr_deploy to work for more current versions of the manager
Added tomcat_mgr_upload.  This is pretty much equivalent to tomcat_mgr_deploy but it works on 5.5.36, 6.0.37, 7.0.50, 8.0.0rc10
Cleaned up spaces at EOL