Dev dependencies

- Added PHPUnit 3.7 as a dev dependency
- Added gitignore directives for composer.lock and vendor/
Merge branch 'develop'

Merge in PHPUnit dev dependency