Makefile.am: Sync with new files

Change-Id: I76eed2948b209a5db56f121f0090eca675e32230
Reviewed-on: http://review.couchbase.org/31804
Reviewed-by: Mark Nunberg <mnunberg@haskalah.org>
Tested-by: Mark Nunberg <mnunberg@haskalah.org>