small fixes

rowers/dataprep.py

@@ -1177,7 +1177,6 @@ def new_workout_from_file(r, f2,
     message = None
     try:
         fileformat = get_file_type(f2)
-        print fileformat,'aap'
     except IOError:
         os.remove(f2)
         message = "Rowsandall could not process this file. The extension is supported but the file seems corrupt. Contact info@rowsandall.com if you think this is incorrect."

rowers/teams.py

@@ -393,7 +393,6 @@ def send_request_email(rekwest):
     code = rekwest.code
     teamname = rekwest.team.name
     requestor = rekwest.user.first_name+' '+rekwest.user.last_name
-    print requestor,'aap'
 
     res = myqueue(queuehigh,
                   handle_sendemail_request,

rowers/uploads.py

@@ -124,7 +124,7 @@ def gettypeoptions_body2(uploadoptions,body):
         if testerb.match(line.lower()):
             for typ,verb in boattypes:
                 str1 = '^(boat)(.*)({a})'.format(
-                    a = typ
+                    a = typ.replace('+'.'\+')
                     )
                 testert = re.compile(str1)
                 if testert.match(line.lower()):