-fixed velocity email template to match site look
-moved velocity email template to better location
-added todo's for bugs