Merge pull request #3 from kkochis/master

Updating to latest in master
Merge pull request #5 from kkochis/master

Merge pull request #3 from kkochis/master
Adding sortable directive
Adding sortable directive
Merge branch 'jasons_sortable_cols' into sortable_cols
Merge pull request #9 from kkochis/master

Updating to latest in master
Merge pull request #11 from kkochis/master

Updating to latest in master
Merge branch 'sortable_cols' of https://github.com/jklewa/dashes into sortable_cols

Conflicts:
	js/controllers.js
Fixing bug from jklewa:sortable_cols merge
Merge pull request #13 from kkochis/sortable_cols

Sortable cols