Merge branch 'master' of github.com:ryanmt/msplinter

Conflicts:
	Rakefile
Merge branch 'master' of github.com:ryanmt/msplinter