more slightly weird emails allowed. still too strict for the standard
Merge branch 'master' of github.com:nicholaskariniemi/grubfs
Merge branch 'master' of github.com:nicholaskariniemi/grubfs
Merge branch 'master' into fix/update_jquery