Merge branch 'time_series_moving_average'
Merge remote-tracking branch 'kjs_fork/master'
fix conflict, remove useless function
reolve conflict
move cpp files up one dir
fix includes, fix test
fix path in setup
Merge pull request #41 from kjs73/move_cpp_files

Move cpp files
resolve conflict