Actually fix bin bug and update git ignore
Merge branch 'develop'