Merge pull request #29 from ianwalter/development

Fixing issues
Adding bower libs to source control