Make content modal small
Task for importing imprintable data from google spreadsheet
Fix size/color grid displaying every color and size

Extend test suite
Merge branch 'develop' into develop-ricky
Fix basic info displaying all possible colors and not associated colors, expand spec
Adding coordinates and imprintable data
Merge branch 'develop-ricky' into develop
Added n/a to sizing group
Added n/a to sizing group
Merge branch 'develop' into develop-ricky
Added supplier info, updated rake task to populate supplier details
Make gitignore ignore Solr stuff.
Separate timeout modal from content modal
Rpsec, reworked imprintable layout
Merge branch 'adding-supplier-info' into develop-ricky

Conflicts:
	lib/tasks/imprintables.rake
Add a safe framework for the content modal
Change development timeout back to 2 billion!
Merge branch 'develop-nigel' into develop
Fix typo
Kaminari Pagination for Imprintables