Added UPDATE and FIND_ALL for couchpotato
Merge cleanup