Merge pull request #1 from lefnire/master

Update my fork
Merge pull request #2 from lefnire/master

Update my copy
reposition Todo options, use proper icon
clean up nbsp, replace old gcal markup with new markup, still commented out
WIP: new 'Task Actions' UI (buttons, checkboxes, etc)
better responsive breakpoints, more robust custom grid
circle icon for uncompleted tasks, and rollin with square edges for now
further refactoring of tasks code. Last commit before merge in the revert
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/tasks.styl
	views/app/tasks.html
proper derby tabbing
re-enstate double-rewards bug fix
rename priority multiplier to "Difficulty" -> easy, medium,
hard (people keep getting confused) and putting it back into
"advanced" section
add help popover to difficulty
add the bootstrap update
upgrade bootstrap
re-add Lato webfont
comment out webkit-devtools-agent - only for my pesronal use, really
Merge branch 'develop' into zakkain-ui-tweaks
remove responsive from bootstrap includes. Rolling our own!
allow task text to word-wrap and be padded from element edge