added consistency cost for densifying the flows
Merge branch 'master' of https://github.com/tinghuiz/align_flow