Merge proposals dependent on lp:~bflanagin/cafesync/release

lp:~bflanagin/cafesync/release has no merge proposals.