Ignore archive directory.
Update SDL2 snapshot to 2013-05-04, rev 7140.
Merge branch 'master' into raring