Synchronize, Compile Conflicts, Fixes

* Use /config/.apex_file_properties to determine if there is a conflict
with the server
* Use DiffMerge for synchronizing
* Improved payload parameter handling
* Better line/col error handling
* New setting mm_compile_check_conflicts

Conflicts:
	Context.sublime-menu
	Side Bar.sublime-menu
	util.py
Merge pull request #147 from doublesharp/patch-conflict-synchronize-merge

Synchronize, Compile Conflicts, Fixes