Added virtualenv to gitignore
Did some major refactoring to the code.