Updates for move to Mavericks
Merge branch 'master' of git://github.com/hwine/account_init_files