Added yaml.Playing with parsing.
Merge branch 'thefuture' of github.com:tbenthompson/codim1 into thefuture

Conflicts:
	fast/.tup/db
	fast/lib/catch_with_main.hpp.gch