improve compatability with WP 3.6
refactoring diff.php to use mergely.js. adding mergely code to js/ (sans its examples and docs; just the source)
start of three-way diff for mergely
compare/diff functionality, resolve failing tests
fixing diff.php
Merge branch 'dev-3.6'
Merge pull request #64 from alleyinteractive/master

WP 3.6 Compatability