Rebase master branch so that this PR can be updated with the latest changes. Conflicts has been solved. dev_seeds has been also adapted to the new format (it all separated to be easier to manage). Some specs has been updated to work with selenium-webkit.