Added .merlin file for better editor integration

Also, switched from annot to the newer bin_annot, which speeds up the build.
Set default size for app list and cache explorer boxes

The open too small on Ubuntu 14.04.
Merge branch 'b2.6'