fixing gitignore
Capistrano tweaking / .gitignore
Merge branch 'master' of github.com:floored1585/pixel
Upstream deletes