update version in __init__.py

closes #1124
update version in setup.py

closes #1124
Merge branch 'master' of https://github.com/sunpy/sunpy into lyra_flare_detection