ui bootstrap
minor progress
more progress
IM work
tidying up duplicate files
more IM work, tidying up, and back to the old bootstrap
removing old IM stuff. committing separately in case we need it later
Merge pull request #3 from JoeyScarr/master

Update