cleaned up folder structure
created working test env for model
creating twitter stream  branch
1005
travis
merge
merge conflicts