scary routes constraint for redirect
301
Tweaked gitignore
added buy link
Merge branch 'master' of github.com:madebymany/votr
Merge branch 'redesign' of github.com:madebymany/votr

Conflicts:
	app/views/pages/index.html.erb
Added vote now link
Removing superfluous status
Removed comment
Added link to all proposals
next batch notification
move voting datee
speakers
Merge branch 'master' of github.com:madebymany/votr into redesign

Conflicts:
	app/views/pages/index.html.erb
	latest.dump