Use python-Levenshtein for fuzzy string matching
Merge branch 'master' into levenshtein

Conflicts:
	nbdiff/commands.py
postRender/preRender events out of main controller into diff/merge controllers.
now moves cells properly
cleanup
added semi-colons
making jshint happy
changed tabs back to spaces
Merge pull request #176 from tarmstrong/refactor-postrender-prerender-js

Refactor diff/merge js controllers
Merge pull request #175 from tarmstrong/levenshtein

Use python-Levenshtein for fuzzy string matching
Merge pull request #177 from bsplay/cell_type_fix

Cell type fix
Forgot to add some stuff this morning
Merge pull request #178 from bsplay/added_missing_stuff

Forgot to add some stuff this morning