- fixed a bug with Qunit tests
	- model was not imported
Merge https://github.com/jasonpharder/notes-n-things
Merge https://github.com/jasonpharder/notes-n-things
- added qunit tests

Merge https://github.com/jasonpharder/notes-n-things

Conflicts:
	public/js/template_tests.js
Merge branch 'master' of git://github.com/jasonpharder/notes-n-things