Merge branch 'master' of https://github.com/markthiessen/pulse
Updated gitignore