Merge pull request #6 from mozilla/master

automatic south migrate