Squashed commit of the following:

commit dde380c6e727c24aa7642ebe40574d7eb885f4f4
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 13:23:38 2014 +0000

    Fixed bug with completion

commit df1dc067c39daee881fba0934e033a8afebfa74d
Merge: b6a2fb9 f615ada
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 03:14:26 2014 -0800

    Merge pull request #6 from adaptlearning/tests

    Fix for tests

commit f615adaf97f9ef0957a70c2f060ce3e86b59a5d9
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Thu Jan 16 10:41:09 2014 +0000

    Test path update

commit 084b23c5fe3c30757cc8f3a53a26fa35d7898dc5
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Thu Jan 16 09:17:18 2014 +0000

    Fix for tests

commit b6a2fb948000917d48a1fd4a1e170c3d0733225c
Merge: 0e15572 2835994
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 16:08:12 2014 +0000

    Merge branch 'master' into develop

    * master:
      Adjusted inview to sit with backbone events
      Fixed merge conflict
      Updated component name prefix