Merge pull request #10 from nathankopp/master

improve contacts import with ajax import/skip actions
Fixing some tests
Merge pull request #11 from andrewhao/fix-tests

Fixing some tests
fixups
Merge branch 'master' of https://github.com/andrewhao/mailbox
Forcing production to use SSL.
Merge pull request #12 from andrewhao/auto-redirect-ssl

Forcing production to use SSL.
Update README.md
Merge.
filter contact to only those with email and phone
Gmail import ui improvements