Merge pull request #1 from mitchmac/master

Updates
Merge pull request #2 from mitchmac/master

Catching up on dev
Merge pull request #3 from mitchmac/master

Remove deleted content types and fields from the islandora_sync db tables
Replace files from the same datastream rather than renaming