Fixes #35. Removed all references to short and long versions of names, and instead just made the long names the default
Merge branch 'master' of github.com:Fingerpaint/project-code