Updated with merge from master and dealt with conflict in appDelegate
In process changes
Updated for keychain storage instead of nsuserdefaults
Conflicts (which were random junk) have been fixed on latest git pull