ignore DS_Store and *.pyc
Merge remote-tracking branch 'origin/master'
bootstrap
bootstrap