Merge pull request #3 from starverte/master

Merge from starverte
Rename "font" directory to "fonts" so glyphicon font can work
Merge pull request #102 from mbeall/master

Bug fixes