refactored to bootstrap 3
Merge branch 'master' into uberspace