added gitignore and updates
Merge branch 'will' of github.com:skyhook-marketing/sky-base into will