Adding the merge button

[jsilvestre]

Here are some more commits...things are getting ready slowly :D

Also, can you merge the latest changes from master so I can test the new config.js format :)