Merge change
Merge with kokopelli
Adding gitignore for sanity