upkeep
Merge branches 'master' and 'usb_canvas'
Merge branches 'local_canvas' and 'master'
test usb_sync
annex_sync_201402061949
rm missing files
annex_canvas_local_201402062005
annex_canvas_local_201402062356
annex_canvas_local_201402070121
Merge branch 'master' of https://github.com/wurde/canvas

Conflicts:
	datatype/canvas_hash.rb