pulled in master
commented out cardcache
pulled in changes
pulled in clints changes