gitignore, removed reliance on jquery extend method and renamed some methods