Merge branch 'release-0.2'

Merged in the code for release 0.2
Delete .gitignore.swp
Merge branch 'develop'

Merged in the new changes, forming release 0.3.
Version 0.3
Merge branch 'master' into develop

Merge the 0.3 release.
Added the ability to use ~ in configuration files.