Committing so I can force an overwrite
Fixing merge conflicts to bring in Sunny's changes
Rubocop fixes, and some updates to the imports controller logic
Merge pull request #21 from codefellows/pete

Pete