updated TODO to reflect current state
Merge branch 'develop' of github.com:RyanMacG/sbcdb into develop

* 'develop' of github.com:RyanMacG/sbcdb:
  updated changelog
  fixed a typo in the dashboard
updated TODO for next release target
removed duplicate from gemfile
filters working with jquery-datatables-rails, request sent to KT for feedback
Merge branch 'feature/filters' into develop

* feature/filters:
  filters working with jquery-datatables-rails, request sent to KT for feedback
  removed duplicate from gemfile
tidied up the layout of the filters, further work to be carried out upon KT request
updated todo
updated changelog and todo
made relevant changes to make project more adaptable, updated readme with instructions
added an example defaults file, modified the capistrano deployer to include this and updated readme
Merge branch 'feature/company-clean' into develop

* feature/company-clean:
  added an example defaults file, modified the capistrano deployer to include this and updated readme
  made relevant changes to make project more adaptable, updated readme with instructions
  updated changelog and todo
updated readme with license
further environment variables
fixed dropdown lists
added regional filters at KT request
updated todo and changelog
Merge branch 'release/1.3.3'

* release/1.3.3:
  updated todo and changelog
  added regional filters at KT request
  fixed dropdown lists
  further environment variables
  updated readme with license
  added an example defaults file, modified the capistrano deployer to include this and updated readme
  made relevant changes to make project more adaptable, updated readme with instructions
  updated changelog and todo
  updated todo
  tidied up the layout of the filters, further work to be carried out upon KT request
  filters working with jquery-datatables-rails, request sent to KT for feedback
  removed duplicate from gemfile
  updated TODO for next release target
  updated TODO to reflect current state