Merge branch 'cdf'

Merging in CDF functionality.
Updated .gitignore to ignore swap files.
Merge branch 'master' of github.com:MurphyMarkW/Genepy into cdf

Adding in the change to .gitignore to ignore swap files.