Twitterbootstrap

The site now runs with Twitter Bootstrap and Asset plugin, so no need to keep it two separate branches.