Add Gemfile.lock to .gitignore
Add Machinist factory provider with specs.
Requre rspec 2.14
Use stub_const for FactoryGirl Provider tests
Merge remote-tracking branch 'origin/master' into support-machinist

Conflicts:
	smokestack.gemspec
Update minor version number
Remove empty before block
Merge pull request #7 from centro/support-machinist

Support machinist