Fixes #36 and fixes #37

Squashed commit of the following:

commit c811cb210c2c3546cdbeb0d11c943a3dcb460670
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 19 12:21:52 2013 +0000

    Add bower to package.json and updated classes on views