email and resque functionality
fixed merge conflict
fixed tool_shed controller line
Merge pull request #14 from ashag/calendar

Minor email fixes, sign in button, adding resque