Merge pull request #10 from hajee/master

Added easy_type badge
remove lock
new SAF types
added OPSS migration to DB
travis syntax fix