Fix pinax path issues
Fix merge conflict with .gitignore
Merge pull request #34 from timlinux/master

Fix pinax path issues