New migration to BS 3.0.3
Merge remote-tracking branch 'upstream/master'
Heights and not working with box sizing. Hurting my brain
Should never use sprockets with SASS - doesn't allow import of variables. Fixed user grid, started using mixins
Fucking bullshit simple form dsl.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/show.html.haml
Fixe snow widths overflowing
Further bootstrap additions
Further padding/margin amendments
Fixed grid offsets for form submit buttons
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/static/about.html.haml
A few more cleanup fixes
Added typeahead component, fixed tests. BS3.0.0 upgrade complete. Fixes #269 and #373
Merge pull request #513 from annez/master

Bootstrap 3.0.3 upgrade and stylesheet upgrades
Merge branch 'master-andrew' into adding-language-norwegian

Conflicts:
	app/views/gifts/_form.html.haml
	app/views/projects/_form.html.haml
	app/views/users/show.html.haml
Adding more strings to locales
Tiny fixes.