Dev merge into master

Merge is adding twitter bootstrap and various style updates.