Midori is ready for merging

Don't know if there is any interest in merging midori now that firefox is working...
Have been using midori for almost a week now and it was a big step up from dillo and netsurf.
Also have qupzilla working on both qt 4.8.5 and qt 5.1.1, but midori was better.
Midori habdled SSL sites better and used less memory than qupzilla.
Midori depends on the fix for make, unfortunately