Merge pull request #1 from guymann/master

Move to twitter bootstrap.