update to 2014-05-06
Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git

Conflicts:
	example_2_6.py
	johansen_test.py