Tidy up
Update gitignore
Merge branch 'master' of https://github.com/Webscope/WS-Bootstrap