Adding sampledata bits for development and test

plus other junk that probably doesn't belong here
Merge remote-tracking branch 'origin/master' into sample-data

Conflicts:
	lib/volunteer_portal/app.rb
Moving SMTP_PASSWORD to secure vars
Un-borking stale checkin tests and such
Merge remote-tracking branch 'origin/master' into sample-data
Adding SALT env var
Disabling heroku deployer for nowwwwww
Merge pull request #62 from globallinks/sample-data

Adding sampledata bits for development and test