Merge tag 'sparks-3.2.5' into develop

3.2.5
Add a new `shell` upstart template for ipython notebooks shell.
upstart template description fixes.
bump version in __init__.py
Merge branch 'release/3.3'