Added composer.phar src dir and updated ignore
Merge remote-tracking branch 'origin/master'