Move to manifest version 2

#12