Merge pull request #64 from wvus-ibu/master

Bring wip up to date
Updating font awesome from 3.2.0 to 3.2.1
Updating to 1.1.2