local updates
Merge branch 'master' of https://github.com/travisdesell/tao

Conflicts:
	asynchronous_algorithms/ant_colony_optimization.cxx
Merge branch 'master' of https://github.com/travisdesell/tao
Merge branch 'master' of https://github.com/travisdesell/tao
Merge branch 'master' of https://github.com/travisdesell/tao
Merge branch 'master' of https://github.com/travisdesell/tao
Merge branch 'master' of https://github.com/travisdesell/tao
Added missing header files
Merge branch 'master' of https://github.com/travisdesell/tao
Merge branch 'master' of https://github.com/travisdesell/tao
Fixed bad for loop