Remove vestiges of FXKeychain

there were still some traces of FXKeychain, which
has been removed for a while now. Cleaned those up.
standardize variable names with ID

replace fooId with fooID to be consistent with other areas
of the code.
Remove warnings about delete method

The parameter was taking a CKIModel *, but really just wanting a class.
Remove some warnings with shadowed inner variables

task was an inner variable being shadowed by an outer variable. Twice.
Fixed this problem, and got rid of a warning by casting
Merge pull request #80 from jarsen/master

Clean up