Fixed bug with edited at checking
Merge branch 'dev'
I know what I am doing
update rails to 3.2.13
removed strange stuff
Revert "I know what I am doing"

This reverts commit b83d842f0243a9b0d2a2571f518a818c79f93fdb.
Revert deploy file
Just attempting to remove the source of error
Deploying from current branch instead
Now it's possible to deploy
Merge branch 'dev'

Merge with dev.
Cap deploy to webfaction works
Readded some additional deploy stuff things
Use a shared path for on-server database use
Fixed small bug with SetEnv
Clean up cache after deploy
Blog design change
Merged branch webfaction-deploy
Solved the fucking stupid merge conflict
Changed branch to deploy from