Updating conference announcement for 2014
more edits
Merge pull request #2 from scopatz/general_announcement

Fixed up some announcement mailing issues, incorporated Andy's suggestions
Merge pull request #34 from MatthewTurk/general_announcement

Updating conference announcement for 2014
Merge branch 'master' of github.com:scipy/scipy-conference