pull from upstream
merge with upstream
Merge branch 'master' of github.com:Originate/flms
Merge branch 'master' of github.com:Originate/flms
added rake tasks to generate views and styles closes and updated README
closes #79
Merge pull request #98 from maxwellE/feature/better_control_of_styling_#79

Feature/better control of styling #79
cleanup readme and remove technical section closes #99
pull from upstream
updated gem version and various gem info closes #100
more gemspec updates
Merge pull request #101 from maxwellE/feature/remove_technical_section_from_readme#99

cleanup readme and remove technical section closes #99
wrong rob...
Merge pull request #102 from maxwellE/feature/update_gem_version#100

updated gem version and various gem info closes #100
user now gets reasonable feedback when s3.yml does not exist
add fake buckets to example
Merge pull request #104 from maxwellE/feature/fix_instructions#103

user now gets reasonable feedback when s3.yml does not exist
do not run s3 check on travis
Merge pull request #105 from maxwellE/feature/fix_travis_for_s3_check

do not run s3 check on travis build
more emails in gemspec as per requested by @kevgo
Merge pull request #106 from maxwellE/feature/add_other_emails

more emails in gemspec as per requested by @kevgo