cleaned up folder structure
created working test env for model
1005
travis
merge
merge conflicts
Merge branch 'dev' into twitter-stream
setup controler test file; create questions.md