Merge pull request #6 from davearel/master

Adding almond and underscore.
checkpoint so we can merge daves upstream changes
Merge branch 'master' of github.com:bellycard/doghouse

Conflicts:
	views/layout.jade
Pushing styles up to Dave so he can start pluggin in
Merge pull request #7 from kylefoundry/making-this-look-good

Pushing styles up to Dave so he can start pluggin in
basic CRUD functionality for events
Merge branch 'master' of github.com:bellycard/doghouse
Pushing up progress just in case
Merge pull request #8 from kylefoundry/making-this-look-good

Pushing up progress just in case
Merge branch 'master' of github.com:bellycard/doghouse
fixing bad merge
Merge pull request #9 from craigulliott/master

v1 basic crud functions, with an event model
Finished styling for issues page
Merge pull request #10 from kylefoundry/making-this-look-good

Finished styling for issues page
Added js to set active nav tab
Styled events list page
Removed active tab js
Merge pull request #11 from kylefoundry/making-this-look-good

Added js to set active nav tab
Styled issue drop down filters and misc issue styles
Merge pull request #12 from kylefoundry/making-this-look-good

Styled issue drop down filters and misc issue styles