basic rails framework, postgres as db, rspec for tests
added factory girl, moved rspec
Merge remote-tracking branch 'origin/master'