Merge branch 'master' of https://git.coding.net/wegamekinglc/Alpha-Mind

.travis.yml

@@ -39,8 +39,6 @@ install:
   - conda install scikit-learn
   - conda install cython
   - conda install -c conda-forge arrow
-  - pip install cvxopt
-  - pip install cvxpy
   - pip install simpleutils
   - pip install coveralls
   - pip install finance-python

requirements.txt

 arrow >= 0.10.0
 cython >= 0.25.2
-finance-python >= 0.5.7
 numpy >= 1.12.1
-numba >= 0.33.0
+pandas >= 0.19.2
 scikit-learn >= 0.18.1
+numba >= 0.33.0
 scipy >= 0.19.0
 simpleutils >= 0.1.0
 sqlalchemy >= 1.1.9
-pandas >= 0.19.2
 psycopg2 >= 2.7.1
-Finance-Python >= 0.5.5
+finance-python >= 0.5.7
\ No newline at end of file