Updated so that it now seems to work seamlessly with bootstrap2 will add later testing files and more thorough tests