Use correct user object
White space niggles ... should there be spaces at the end of lines?
Using jquerylocal with colourstrap will add switch to use fontawesome over
silk icon set with options for other icons and pallet sets.
Merge with master