Merge pull request #584 from airbnb/ryandeivert-1.6.0-bump

bumping version from 1.5.0 -> 1.6.0

manage.py

@@ -28,8 +28,9 @@
 import os
 import string
 
+
+from stream_alert import __version__ as version
 from stream_alert.shared import metrics
-from stream_alert_cli import __version__ as version
 from stream_alert_cli.logger import LOGGER_CLI
 from stream_alert_cli.runner import cli_runner
 from app_integrations.apps.app_base import StreamAlertApp
@@ -1444,6 +1445,12 @@ def build_parser():
         prog='manage.py',
         usage=usage,
         formatter_class=RawTextHelpFormatter)
+
+    parser.add_argument(
+        '-v', '--version',
+        action='version',
+        version='StreamAlert v{}'.format(version)
+    )
     subparsers = parser.add_subparsers()
     _add_output_subparser(subparsers)
     _add_live_test_subparser(subparsers)

stream_alert/__init__.py

@@ -1,2 +1,2 @@
 """StreamAlert version."""
-__version__ = '1.5.0'
+__version__ = '1.6.0'

stream_alert_cli/__init__.py

@@ -1,2 +0,0 @@
-"""Define the version of the CLI."""
-__version__ = '1.4.0'