pushing ross' code
Merge branch 'develop' of github.com:scikit-hammertime/scikit_hammertime into develop