Merged authentication so they don't step on eachother

Fixed: iCal authentication with API Key