phase space with/without bumps
updates
more extensions for gitignore
updates 08282014