Moved bootstrap to bootstrap2, set bootstrap to use 3
Removed unneeded label class for bs3
Merge pull request #1 from StevenClontz/master

Updated to bootstrap 3