Tests and rakefile
Updated makefile
Merge pull request #1 from jleeothon/expectancy

Added Expectancy and tests