Make bootstrapping with blank database possible; upgrade to rails 3.2.9
Merge remote-tracking branch 'origin/master'