Handle differences between the local and remote files

Closes #17 

<!---
@huboard:{"order":0.0008550174534320831,"milestone_order":29,"custom_state":""}
-->