Code refactoring, cleanup and improvements. Rails 4.2 support
Merge pull request #37 from rocksolidwebdesign/code_clean_up

Code refactoring, cleanup and improvements. Rails 4.2 support