Change some vocabulary
Add some sample parasite code
Merge branch 'master' of github.com:NickStephens/elfit

Conflicts:
	readme