Update Capfile

Switch back to deploying from master. This site has now been migrated
to the new Linode instance so I'm ready to merge these changes to
master and continue deploying from there.
Remove ServerAlias from Apache config

I wanted to be able to access this site at badger.gofreerange.com while
in the transition period. It's now up and running on the new server so
we can remove this alias.