updating .gitignore so i can work with webstorm
basic refactoring
Merge pull request #8 from gillyb/master

Basic refactoring